Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-3_34] Fix sublayers not added to legend after drag and drop #56406

Merged
merged 4 commits into from
Feb 19, 2024
Merged

[Backport release-3_34] Fix sublayers not added to legend after drag and drop #56406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95aa80a
Fix sublayers not added to legend after drag and drop
elpaso Feb 19, 2024
573e461
Update client code
elpaso Feb 19, 2024
0c54351
Add comment about single layers
elpaso Feb 19, 2024
a9def5d
Update app client code
elpaso Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 39 additions & 20 deletions src/app/layers/qgsapplayerhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,17 +1073,17 @@ QList< QgsMapLayer * > QgsAppLayerHandling::openLayer( const QString &fileName,
return openedLayers;
}

QgsVectorLayer *QgsAppLayerHandling::addVectorLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
QList<QgsVectorLayer *>QgsAppLayerHandling::addVectorLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
{
return addLayerPrivate< QgsVectorLayer >( Qgis::LayerType::Vector, uri, baseName, !provider.isEmpty() ? provider : QLatin1String( "ogr" ), true, addToLegend );
}

QgsRasterLayer *QgsAppLayerHandling::addRasterLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
QList<QgsRasterLayer *>QgsAppLayerHandling::addRasterLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
{
return addLayerPrivate< QgsRasterLayer >( Qgis::LayerType::Raster, uri, baseName, !provider.isEmpty() ? provider : QLatin1String( "gdal" ), true, addToLegend );
}

QgsMeshLayer *QgsAppLayerHandling::addMeshLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
QList<QgsMeshLayer *>QgsAppLayerHandling::addMeshLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend )
{
return addLayerPrivate< QgsMeshLayer >( Qgis::LayerType::Mesh, uri, baseName, provider, true, addToLegend );
}
Expand Down Expand Up @@ -1148,10 +1148,15 @@ QList<QgsMapLayer *> QgsAppLayerHandling::addGdalRasterLayers( const QStringList

// try to create the layer
cursorOverride.reset();
QgsRasterLayer *layer = addLayerPrivate< QgsRasterLayer >( Qgis::LayerType::Raster, uri, layerName, QStringLiteral( "gdal" ), showWarningOnInvalid );
res << layer;
const QList<QgsRasterLayer *> layersList { addLayerPrivate< QgsRasterLayer >( Qgis::LayerType::Raster, uri, layerName, QStringLiteral( "gdal" ), showWarningOnInvalid ) };

if ( layer && layer->isValid() )
// loop and cast
for ( QgsRasterLayer *layer : std::as_const( layersList ) )
{
res.append( layer );
}

if ( ! layersList.isEmpty() && layersList.first()->isValid() )
{
//only allow one copy of a ai grid file to be loaded at a
//time to prevent the user selecting all adfs in 1 dir which
Expand Down Expand Up @@ -1342,7 +1347,7 @@ QList< QgsMapLayer * > QgsAppLayerHandling::addDatabaseLayers( const QStringList
}

template<typename T>
T *QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &uri, const QString &name, const QString &providerKey, bool guiWarnings, bool addToLegend )
QList<T *>QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &uri, const QString &name, const QString &providerKey, bool guiWarnings, bool addToLegend )
{
QgsSettings settings;

Expand Down Expand Up @@ -1375,7 +1380,7 @@ T *QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &ur
const bool canQuerySublayers = providerMetadata &&
( providerMetadata->capabilities() & QgsProviderMetadata::QuerySublayers );

T *result = nullptr;
QList<T *> result;
if ( canQuerySublayers )
{
// query sublayers
Expand All @@ -1398,7 +1403,7 @@ T *QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &ur
}

// since the layer is bad, stomp on it
return nullptr;
return QList<T *>();
}
else if ( sublayers.size() > 1 || QgsProviderUtils::sublayerDetailsAreIncomplete( sublayers, QgsProviderUtils::SublayerCompletenessFlag::IgnoreUnknownFeatureCount ) )
{
Expand All @@ -1416,14 +1421,22 @@ T *QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &ur
const QList< QgsProviderSublayerDetails > selectedLayers = dlg.selectedLayers();
if ( !selectedLayers.isEmpty() )
{
result = qobject_cast< T * >( addSublayers( selectedLayers, baseName, dlg.groupName(), addToLegend ).value( 0 ) );
const QList<QgsMapLayer *> layers { addSublayers( selectedLayers, baseName, dlg.groupName(), addToLegend ) };
for ( QgsMapLayer *layer : std::as_const( layers ) )
{
result << qobject_cast<T *>( layer );
}
}
}
break;
}
case SublayerHandling::LoadAll:
{
result = qobject_cast< T * >( addSublayers( sublayers, baseName, QString(), addToLegend ).value( 0 ) );
const QList<QgsMapLayer *> layers { addSublayers( sublayers, baseName, QString(), addToLegend ) };
for ( QgsMapLayer *layer : std::as_const( layers ) )
{
result << qobject_cast<T *>( layer );
}
break;
}
case SublayerHandling::AbortLoading:
Expand All @@ -1432,36 +1445,42 @@ T *QgsAppLayerHandling::addLayerPrivate( Qgis::LayerType type, const QString &ur
}
else
{
result = qobject_cast< T * >( addSublayers( sublayers, name, QString(), addToLegend ).value( 0 ) );
const QList<QgsMapLayer *> layers { addSublayers( sublayers, name, QString(), addToLegend ) };

if ( result )
if ( ! layers.isEmpty() )
{
QString base( baseName );
if ( settings.value( QStringLiteral( "qgis/formatLayerName" ), false ).toBool() )
{
base = QgsMapLayer::formatLayerName( base );
}
result->setName( base );
for ( QgsMapLayer *layer : std::as_const( layers ) )
{
layer->setName( base );
result << qobject_cast<T *>( layer );
}
}
}
}
else
{
// Handle single layers (no sublayers available for this provider): result will
// contain at most one single layer
QgsMapLayerFactory::LayerOptions options( QgsProject::instance()->transformContext() );
options.loadDefaultStyle = false;
result = qobject_cast< T * >( QgsMapLayerFactory::createLayer( uri, name, type, options, providerKey ) );
if ( result )
result.push_back( qobject_cast< T * >( QgsMapLayerFactory::createLayer( uri, name, type, options, providerKey ) ) );
if ( ! result.isEmpty() )
{
QString base( baseName );
if ( settings.value( QStringLiteral( "qgis/formatLayerName" ), false ).toBool() )
{
base = QgsMapLayer::formatLayerName( base );
}
result->setName( base );
QgsProject::instance()->addMapLayer( result, addToLegend );
result.first()->setName( base );
QgsProject::instance()->addMapLayer( result.first(), addToLegend );

QgisApp::instance()->askUserForDatumTransform( result->crs(), QgsProject::instance()->crs(), result );
QgsAppLayerHandling::postProcessAddedLayer( result );
QgisApp::instance()->askUserForDatumTransform( result.first()->crs(), QgsProject::instance()->crs(), result.first() );
QgsAppLayerHandling::postProcessAddedLayer( result.first() );
}
}

Expand Down
17 changes: 13 additions & 4 deletions src/app/layers/qgsapplayerhandling.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,13 @@ class APP_EXPORT QgsAppLayerHandling
*
* The \a baseName parameter will be used as the layer name (and shown in the map legend).
*
* \returns the list of layers added, which may contain more than one layer if the
* datasource contains multiple sublayers.
*
* \note This may trigger a dialog asking users to select from available sublayers in the datasource,
* depending on the contents of the datasource and the user's current QGIS settings.
*/
static QgsVectorLayer *addVectorLayer( const QString &uri, const QString &baseName, const QString &provider = QLatin1String( "ogr" ), bool addToLegend = true );
static QList< QgsVectorLayer * >addVectorLayer( const QString &uri, const QString &baseName, const QString &provider = QLatin1String( "ogr" ), bool addToLegend = true );

/**
* Adds a list of vector layers from a list of layer \a uris supported by the OGR provider.
Expand All @@ -90,10 +93,13 @@ class APP_EXPORT QgsAppLayerHandling
*
* The \a baseName parameter will be used as the layer name (and shown in the map legend).
*
* \returns the list of layers added, which may contain more than one layer if the
* datasource contains multiple sublayers.
*
* \note This may trigger a dialog asking users to select from available sublayers in the datasource,
* depending on the contents of the datasource and the user's current QGIS settings.
*/
static QgsRasterLayer *addRasterLayer( QString const &uri, const QString &baseName, const QString &provider = QLatin1String( "gdal" ), bool addToLegend = true );
static QList<QgsRasterLayer * >addRasterLayer( QString const &uri, const QString &baseName, const QString &provider = QLatin1String( "gdal" ), bool addToLegend = true );

/**
* Adds a list of raster layers from a list of layer \a uris supported by the GDAL provider.
Expand All @@ -111,10 +117,13 @@ class APP_EXPORT QgsAppLayerHandling
*
* The \a baseName parameter will be used as the layer name (and shown in the map legend).
*
* \returns the list of layers added, which may contain more than one layer if the
* datasource contains multiple sublayers.
*
* \note This may trigger a dialog asking users to select from available sublayers in the datasource,
* depending on the contents of the datasource and the user's current QGIS settings.
*/
static QgsMeshLayer *addMeshLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend = true );
static QList< QgsMeshLayer *>addMeshLayer( const QString &uri, const QString &baseName, const QString &provider, bool addToLegend = true );

/**
* Post processes an entire group of added \a layers.
Expand Down Expand Up @@ -204,7 +213,7 @@ class APP_EXPORT QgsAppLayerHandling

private:

template<typename T> static T *addLayerPrivate( Qgis::LayerType type, const QString &uri, const QString &baseName, const QString &providerKey, bool guiWarnings = true, bool addToLegend = true );
template<typename T> static QList<T *>addLayerPrivate( Qgis::LayerType type, const QString &uri, const QString &baseName, const QString &providerKey, bool guiWarnings = true, bool addToLegend = true );

/**
* Post processes a single added \a layer, applying any default behavior which should
Expand Down
24 changes: 18 additions & 6 deletions src/app/qgisapp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,18 +2463,27 @@ QList< QgsMapLayer * > QgisApp::handleDropUriList( const QgsMimeDataUtils::UriLi
}
else if ( u.layerType == QLatin1String( "vector" ) )
{
if ( QgsMapLayer *layer = QgsAppLayerHandling::addVectorLayer( uri, u.name, u.providerKey, addToLegend ) )
const QList<QgsVectorLayer *> layerList { QgsAppLayerHandling::addVectorLayer( uri, u.name, u.providerKey, addToLegend ) };
for ( QgsVectorLayer *layer : std::as_const( layerList ) )
{
addedLayers << layer;
}
}
else if ( u.layerType == QLatin1String( "raster" ) )
{
if ( QgsMapLayer *layer = QgsAppLayerHandling::addRasterLayer( uri, u.name, u.providerKey, addToLegend ) )
const QList<QgsRasterLayer *> layerList { QgsAppLayerHandling::addRasterLayer( uri, u.name, u.providerKey, addToLegend ) };
for ( QgsRasterLayer *layer : std::as_const( layerList ) )
{
addedLayers << layer;
}
}
else if ( u.layerType == QLatin1String( "mesh" ) )
{
if ( QgsMapLayer *layer = QgsAppLayerHandling::addMeshLayer( uri, u.name, u.providerKey, addToLegend ) )
const QList<QgsMeshLayer *> layerList { QgsAppLayerHandling::addMeshLayer( uri, u.name, u.providerKey, addToLegend ) };
for ( QgsMeshLayer *layer : std::as_const( layerList ) )
{
addedLayers << layer;
}
}
else if ( u.layerType == QLatin1String( "pointcloud" ) )
{
Expand Down Expand Up @@ -5692,7 +5701,8 @@ QString QgisApp::crsAndFormatAdjustedLayerUri( const QString &uri, const QString

QgsMeshLayer *QgisApp::addMeshLayer( const QString &url, const QString &baseName, const QString &providerKey )
{
return QgsAppLayerHandling::addMeshLayer( url, baseName, providerKey );
const QList<QgsMeshLayer *> layers { QgsAppLayerHandling::addMeshLayer( url, baseName, providerKey ) };
return layers.isEmpty() ? nullptr : layers.first();
}

template<typename L>
Expand Down Expand Up @@ -13118,7 +13128,8 @@ void QgisApp::show3DMapViewsManager()

QgsVectorLayer *QgisApp::addVectorLayer( const QString &vectorLayerPath, const QString &name, const QString &providerKey )
{
return QgsAppLayerHandling::addVectorLayer( vectorLayerPath, name, providerKey );
const QList<QgsVectorLayer *> layers { QgsAppLayerHandling::addVectorLayer( vectorLayerPath, name, providerKey ) };
return layers.isEmpty() ? nullptr : layers.first();
}

void QgisApp::embedLayers()
Expand Down Expand Up @@ -15904,7 +15915,8 @@ void QgisApp::renameView()

QgsRasterLayer *QgisApp::addRasterLayer( QString const &uri, QString const &baseName, QString const &providerKey )
{
return QgsAppLayerHandling::addRasterLayer( uri, baseName, providerKey );
const QList<QgsRasterLayer *> layers { QgsAppLayerHandling::addRasterLayer( uri, baseName, providerKey ) };
return layers.isEmpty() ? nullptr : layers.first();
}

#ifdef ANDROID
Expand Down
Loading