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

Fix DependencySorter.sortedLayerIds. Fixes #14281

Browse Source
This commit is contained in:
Hugo Mercier 2016-02-12 09:15:04 +01:00
parent 0c478d0148
commit 6bbe3b93a2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/qgslayerdefinition.cpp
View File

@ -230,6 +230,7 @@ void QgsLayerDefinition::DependencySorter::init( const QDomDocument& doc )
{
sortedLayers << id;
mSortedLayerNodes << node;
mSortedLayerIds << id;
}
else
layersToSort << qMakePair( id, node );

5
tests/src/python/test_qgslayerdefinition.py
View File

@ -52,10 +52,13 @@ class TestQgsLayerDefinition(unittest.TestCase):
doc.setContent(inDoc)
dep = QgsLayerDefinition.DependencySorter(doc)
nodes = dep.sortedLayerNodes()
nodeIds = dep.sortedLayerIds()
self.assertTrue(not dep.hasCycle())
self.assertTrue(not dep.hasMissingDependency())
self.assertEqual(nodes[0].firstChildElement("id").text(), "layerA")
self.assertEqual(nodes[1].firstChildElement("id").text(), "layerB")
self.assertEqual(nodeIds[0], "layerA")
self.assertEqual(nodeIds[1], "layerB")
def testMissingDependency(self):
inDoc = """
@ -76,7 +79,6 @@ class TestQgsLayerDefinition(unittest.TestCase):
doc = QDomDocument("testdoc")
doc.setContent(inDoc)
dep = QgsLayerDefinition.DependencySorter(doc)
nodes = dep.sortedLayerNodes()
self.assertTrue(not dep.hasCycle())
self.assertTrue(dep.hasMissingDependency())
@ -99,7 +101,6 @@ class TestQgsLayerDefinition(unittest.TestCase):
doc = QDomDocument("testdoc")
doc.setContent(inDoc)
dep = QgsLayerDefinition.DependencySorter(doc)
nodes = dep.sortedLayerNodes()
self.assertTrue(dep.hasCycle())
def testVectorAndRaster(self):