Merge pull request #3742 from nirvn/processing_fix_hasdependencies

nyalldawson · web-flow · commit 08231b8b14cb · 2016-11-12T15:09:26.000+10:00
[processing] check for parent alg dependencies in hasDependencies()
diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -360,6 +360,10 @@ def hasDependencies(self, name):
                 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):
diff --git a/python/plugins/processing/tests/ModelerTest.py b/python/plugins/processing/tests/ModelerTest.py
@@ -27,7 +27,11 @@
 
 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 @@ def testModelerParametersDialogAvailableValuesOfType(self):
         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()
