"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/qgsproject.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgsproject.cpp  (QGIS-final-3_14_15):qgsproject.cpp  (QGIS-final-3_14_16)
skipping to change at line 1043 skipping to change at line 1043
return true; // Decided to return "true" since it's return true; // Decided to return "true" since it's
// possible for there to be a project with no // possible for there to be a project with no
// layers; but also, more imporantly, this // layers; but also, more imporantly, this
// would cause the tests/qgsproject to fail // would cause the tests/qgsproject to fail
// since the test suite doesn't currently // since the test suite doesn't currently
// support test layers // support test layers
} }
bool returnStatus = true; bool returnStatus = true;
emit layerLoaded( 0, nl.count() );
// order layers based on their dependencies // order layers based on their dependencies
QgsLayerDefinition::DependencySorter depSorter( doc ); QgsLayerDefinition::DependencySorter depSorter( doc );
if ( depSorter.hasCycle() || depSorter.hasMissingDependency() ) if ( depSorter.hasCycle() )
return false; return false;
// Missing a dependency? We still load all the layers, otherwise the project i
s completely broken!
if ( depSorter.hasMissingDependency() )
returnStatus = false;
emit layerLoaded( 0, nl.count() );
const QVector<QDomNode> sortedLayerNodes = depSorter.sortedLayerNodes(); const QVector<QDomNode> sortedLayerNodes = depSorter.sortedLayerNodes();
const int totalLayerCount = sortedLayerNodes.count(); const int totalLayerCount = sortedLayerNodes.count();
int i = 0; int i = 0;
for ( const QDomNode &node : sortedLayerNodes ) for ( const QDomNode &node : sortedLayerNodes )
{ {
const QDomElement element = node.toElement(); const QDomElement element = node.toElement();
const QString name = translate( QStringLiteral( "project:layers:%1" ).arg( n ode.namedItem( QStringLiteral( "id" ) ).toElement().text() ), node.namedItem( QS tringLiteral( "layername" ) ).toElement().text() ); const QString name = translate( QStringLiteral( "project:layers:%1" ).arg( n ode.namedItem( QStringLiteral( "id" ) ).toElement().text() ), node.namedItem( QS tringLiteral( "layername" ) ).toElement().text() );
if ( !name.isNull() ) if ( !name.isNull() )
 End of changes. 3 change blocks. 
3 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)