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_36] QgsProject: The flag to read extent from xml was set too late #57297

Merged
merged 2 commits into from
May 13, 2024
Merged

[Backport release-3_36] QgsProject: The flag to read extent from xml was set too late #57297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1ed48
QgsProject: The flag to read extent from xml was set too late
rldhont Apr 22, 2024
e60e011
Tests: Extending QgsProject layer flags test
rldhont Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/core/project/qgsproject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,11 +1315,16 @@ void QgsProject::setAvoidIntersectionsMode( const Qgis::AvoidIntersectionsMode m
static QgsMapLayer::ReadFlags projectFlagsToLayerReadFlags( Qgis::ProjectReadFlags projectReadFlags, Qgis::ProjectFlags projectFlags )
{
QgsMapLayer::ReadFlags layerFlags = QgsMapLayer::ReadFlags();
// Propagate don't resolve layers
if ( projectReadFlags & Qgis::ProjectReadFlag::DontResolveLayers )
layerFlags |= QgsMapLayer::FlagDontResolveLayers;
// Propagate trust layer metadata flag
// Propagate read extent from XML based trust layer metadata flag
if ( ( projectFlags & Qgis::ProjectFlag::TrustStoredLayerStatistics ) || ( projectReadFlags & Qgis::ProjectReadFlag::TrustLayerMetadata ) )
{
layerFlags |= QgsMapLayer::FlagTrustLayerMetadata;
layerFlags |= QgsMapLayer::FlagReadExtentFromXml;
}
// Propagate open layers in read-only mode
if ( ( projectReadFlags & Qgis::ProjectReadFlag::ForceReadOnlyLayers ) )
layerFlags |= QgsMapLayer::FlagForceReadOnly;
Expand Down Expand Up @@ -1661,7 +1666,7 @@ bool QgsProject::addLayer( const QDomElement &layerElem,
// apply specific settings to vector layer
if ( QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mapLayer.get() ) )
{
vl->setReadExtentFromXml( ( mFlags & Qgis::ProjectFlag::TrustStoredLayerStatistics ) || ( flags & Qgis::ProjectReadFlag::TrustLayerMetadata ) );
vl->setReadExtentFromXml( layerFlags & QgsMapLayer::FlagReadExtentFromXml );
if ( vl->dataProvider() )
{
const bool evaluateDefaultValues = mFlags & Qgis::ProjectFlag::EvaluateDefaultValuesOnProviderSide;
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsmaplayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2331,6 +2331,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
bool mMapTipsEnabled = true;

friend class QgsVectorLayer;
friend class TestQgsProject;
friend class TestQgsMapLayer;
};

Expand Down
24 changes: 24 additions & 0 deletions tests/src/core/testqgsproject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "qgslayertree.h"
#include "qgssettings.h"
#include "qgsunittypes.h"
#include "qgsmaplayer.h"
#include "qgsvectorlayer.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutmanager.h"
Expand Down Expand Up @@ -409,6 +410,10 @@ void TestQgsProject::testLayerFlags()
QgsMapLayer *layer = prj2.mapLayer( layer2id );
QVERIFY( layer );
QVERIFY( !layer->flags().testFlag( QgsMapLayer::Removable ) );
QVERIFY( !layer->mReadFlags.testFlag( QgsMapLayer::FlagDontResolveLayers ) );
QVERIFY( !layer->mReadFlags.testFlag( QgsMapLayer::FlagTrustLayerMetadata ) );
QVERIFY( !layer->mReadFlags.testFlag( QgsMapLayer::FlagReadExtentFromXml ) );
QVERIFY( !layer->mReadFlags.testFlag( QgsMapLayer::FlagForceReadOnly ) );

// test setFlags modifies correctly existing layer settings
QVERIFY( !prj2.isDirty() );
Expand All @@ -433,10 +438,29 @@ void TestQgsProject::testLayerFlags()
vlayer = qobject_cast<QgsVectorLayer *>( prj3.mapLayer( layer2id ) );
QVERIFY( vlayer );
QVERIFY( !vlayer->flags().testFlag( QgsMapLayer::Removable ) );
QVERIFY( !vlayer->mReadFlags.testFlag( QgsMapLayer::FlagDontResolveLayers ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagTrustLayerMetadata ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagReadExtentFromXml ) );
QVERIFY( !vlayer->mReadFlags.testFlag( QgsMapLayer::FlagForceReadOnly ) );
QVERIFY( !prj3.isDirty() );
QVERIFY( vlayer->readExtentFromXml() );
QVERIFY( vlayer->dataProvider()->mReadFlags.testFlag( QgsDataProvider::FlagTrustDataSource ) );
QVERIFY( vlayer->dataProvider()->providerProperty( QgsVectorDataProvider::EvaluateDefaultValues ).toBool() );

// check reload of project with read fags that sets the correct layer properties
QgsProject prj4;
prj4.setFileName( f.fileName() );
Qgis::ProjectReadFlags readFlags = Qgis::ProjectReadFlag::DontResolveLayers
| Qgis::ProjectReadFlag::TrustLayerMetadata
| Qgis::ProjectReadFlag::ForceReadOnlyLayers;
QVERIFY( prj4.read( readFlags ) );
vlayer = qobject_cast<QgsVectorLayer *>( prj4.mapLayer( layer2id ) );
QVERIFY( vlayer );
QVERIFY( !vlayer->flags().testFlag( QgsMapLayer::Removable ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagDontResolveLayers ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagTrustLayerMetadata ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagReadExtentFromXml ) );
QVERIFY( vlayer->mReadFlags.testFlag( QgsMapLayer::FlagForceReadOnly ) );
}

void TestQgsProject::testLocalFiles()
Expand Down