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

[processing] check for parent alg dependencies in hasDependencies()

Browse Source
This commit is contained in:
nirvn 2016-11-11 12:21:39 +07:00
parent 156fce989d
commit be2223fed3
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/modeler/ModelerAlgorithm.py
View File

@ -360,6 +360,10 @@ class ModelerAlgorithm(GeoAlgorithm):
elif isinstance(value, ValueFromOutput):
if value.alg == name:
return True
if alg.name != name:
for dep in alg.dependencies:
if (dep == name):
return True
return False
def getDependsOnAlgorithms(self, name):

26
python/plugins/processing/tests/ModelerTest.py
View File

@ -27,7 +27,11 @@ __revision__ = '$Format:%H$'
from qgis.testing import start_app, unittest
from processing.modeler.ModelerAlgorithm import (ModelerAlgorithm, ModelerParameter)
from processing.modeler.ModelerAlgorithm import (Algorithm,
ModelerAlgorithm,
ModelerParameter,
ModelerOutput,
ValueFromOutput)
from processing.modeler.ModelerParametersDialog import (ModelerParametersDialog)
from processing.core.parameters import (ParameterFile,
ParameterNumber,
@ -66,6 +70,26 @@ class ModelerTest(unittest.TestCase):
self.assertEqual(set(p.name for p in dlg.getAvailableValuesOfType([ParameterString, ParameterNumber, ParameterFile])),
set(['string', 'string2', 'number', 'file']))
def testModelerAlgorithmHasDependencies(self):
# test hasDependencies from ModelerAlgorithm
m = ModelerAlgorithm()
a = Algorithm("qgis:clip")
m.addAlgorithm(a)
a2 = Algorithm("qgis:clip")
m.addAlgorithm(a2)
# test parent algorithm dependency
self.assertEqual(m.hasDependencies('QGISCLIP_1'), False)
a2.dependencies = ['QGISCLIP_1']
self.assertEqual(m.hasDependencies('QGISCLIP_1'), True)
# test output algorithm dependency
a2.dependencies = []
a.outputs['OUTPUT'] = ModelerOutput('out')
a2.params['INPUT'] = ValueFromOutput('QGISCLIP_1', 'OUTPUT')
self.assertEqual(m.hasDependencies('QGISCLIP_1'), True)
if __name__ == '__main__':
unittest.main()