sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert renaming of main layer-tree-group node

Browse Source
This commit is contained in:
Matthias Kuhn 2017-03-23 11:34:14 +01:00
parent e5aaceacbe
commit 1ffa9ee7a6
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/layertree/qgslayertree.cpp
View File

@ -114,7 +114,7 @@ QgsLayerTree *QgsLayerTree::readXml( QDomElement &element )
void QgsLayerTree::writeXml( QDomElement &parentElement )
{
QDomDocument doc = parentElement.ownerDocument();
QDomElement elem = doc.createElement( QStringLiteral( "layer-tree" ) );
QDomElement elem = doc.createElement( QStringLiteral( "layer-tree-group" ) );
writeCommonXml( elem );

1
src/core/qgsmapthemecollection.cpp
View File

@ -193,7 +193,6 @@ QList<QgsMapLayer *> QgsMapThemeCollection::masterVisibleLayers() const
// no project layer order set
return visibleLayers;
}
else
{
QList< QgsMapLayer * > orderedVisibleLayers;

13
src/core/qgsproject.cpp
View File

@ -846,23 +846,14 @@ bool QgsProject::read()
mRootGroup->setCustomProperty( QStringLiteral( "loading" ), 1 );
QDomElement layerTreeElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree" ) );
QDomElement layerTreeElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-group" ) );
if ( !layerTreeElem.isNull() )
{
// read the tree but do not resolve the references (we have not loaded the layers yet)
mRootGroup->readChildrenFromXml( layerTreeElem );
}
else
{
QDomElement layerTreeGroupElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-group" ) );
if ( !layerTreeGroupElem.isNull() )
{
mRootGroup->readChildrenFromXml( layerTreeGroupElem );
}
else
{
QgsLayerTreeUtils::readOldLegend( mRootGroup, doc->documentElement().firstChildElement( QStringLiteral( "legend" ) ) );
}
QgsLayerTreeUtils::readOldLegend( mRootGroup, doc->documentElement().firstChildElement( QStringLiteral( "legend" ) ) );
}
mLayerTreeRegistryBridge->setEnabled( false );

4
tests/src/python/test_layer_dependencies.py
View File

@ -202,8 +202,8 @@ class TestLayerDependencies(unittest.TestCase):
newPointsLayer = l.layer()
elif l.layerId().startswith('lines'):
newLinesLayer = l.layer()
self.assertFalse(newPointsLayer is None)
self.assertFalse(newLinesLayer is None)
self.assertIsNotNone(newPointsLayer)
self.assertIsNotNone(newLinesLayer)
self.assertTrue(newLinesLayer.id() in [dep.layerId() for dep in newPointsLayer.dependencies()])
self.pointsLayer.setDependencies([])