sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-04 00:30:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Restore project variables early in the project read cycle

Browse Source 
This ensure project level variables are correctly in place before
trying to read other components which may depend on these variables,
e.g. layouts

Fixes #32382
This commit is contained in:
Nyall Dawson 2019-10-25 08:24:21 +10:00
parent 670c81f921
commit d76835fec5
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/qgsproject.cpp
View File

@ -1296,6 +1296,24 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
}
emit transformContextChanged();
//add variables defined in project file - do this early in the reading cycle, as other components
//(e.g. layouts) may depend on these variables
QStringList variableNames = readListEntry( QStringLiteral( "Variables" ), QStringLiteral( "/variableNames" ) );
QStringList variableValues = readListEntry( QStringLiteral( "Variables" ), QStringLiteral( "/variableValues" ) );
mCustomVariables.clear();
if ( variableNames.length() == variableValues.length() )
{
for ( int i = 0; i < variableNames.length(); ++i )
{
mCustomVariables.insert( variableNames.at( i ), variableValues.at( i ) );
}
}
else
{
QgsMessageLog::logMessage( tr( "Project Variables Invalid" ), tr( "The project contains invalid variable settings." ) );
}
QDomNodeList nl = doc->elementsByTagName( QStringLiteral( "projectMetadata" ) );
if ( !nl.isEmpty() )
{
@ -1450,22 +1468,7 @@ bool QgsProject::readProjectFile( const QString &filename, QgsProject::ReadFlags
}
mSnappingConfig.readProject( *doc );
//add variables defined in project file
QStringList variableNames = readListEntry( QStringLiteral( "Variables" ), QStringLiteral( "/variableNames" ) );
QStringList variableValues = readListEntry( QStringLiteral( "Variables" ), QStringLiteral( "/variableValues" ) );
mCustomVariables.clear();
if ( variableNames.length() == variableValues.length() )
{
for ( int i = 0; i < variableNames.length(); ++i )
{
mCustomVariables.insert( variableNames.at( i ), variableValues.at( i ) );
}
}
else
{
QgsMessageLog::logMessage( tr( "Project Variables Invalid" ), tr( "The project contains invalid variable settings." ) );
}
emit customVariablesChanged();
emit crsChanged();
emit ellipsoidChanged( ellipsoid() );