[processing] fix handling of "Check for edge contamination" option in

alexbruy · alexbruy · commit fe24c8295606 · 2015-03-04T19:38:38.000+02:00
TauDEM algorithms
diff --git a/python/plugins/processing/algs/taudem/TauDEMAlgorithm.py b/python/plugins/processing/algs/taudem/TauDEMAlgorithm.py
@@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
                 commands.append(param.name)
                 commands.append(param.value)
             elif isinstance(param, ParameterBoolean):
-                if param.value and str(param.value).lower() == 'false':
+                if not param.value:
                     commands.append(param.name)
             elif isinstance(param, ParameterString):
                 commands.append(param.name)
diff --git a/python/plugins/processing/algs/taudem/dinfdistdown.py b/python/plugins/processing/algs/taudem/dinfdistdown.py
@@ -118,7 +118,7 @@ def processAlgorithm(self, progress):
             self.STAT_METHOD)]))
         commands.append(str(self.DIST_DICT[self.getParameterValue(
             self.DIST_METHOD)]))
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
         commands.append('-dd')
         commands.append(self.getOutputValue(self.DIST_DOWN_GRID))
diff --git a/python/plugins/processing/algs/taudem/dinfdistdown_multi.py b/python/plugins/processing/algs/taudem/dinfdistdown_multi.py
@@ -119,7 +119,7 @@ def processAlgorithm(self, progress):
             self.STAT_METHOD)]))
         commands.append(str(self.DIST_DICT[self.getParameterValue(
             self.DIST_METHOD)]))
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
         commands.append('-dd')
         commands.append(self.getOutputValue(self.DIST_DOWN_GRID))
diff --git a/python/plugins/processing/algs/taudem/dinfdistup.py b/python/plugins/processing/algs/taudem/dinfdistup.py
@@ -115,7 +115,7 @@ def processAlgorithm(self, progress):
             self.DIST_METHOD)]))
         commands.append('-thresh')
         commands.append(str(self.getParameterValue(self.THRESHOLD)))
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
         commands.append('-du')
         commands.append(self.getOutputValue(self.DIST_UP_GRID))
diff --git a/python/plugins/processing/algs/taudem/dinfdistup_multi.py b/python/plugins/processing/algs/taudem/dinfdistup_multi.py
@@ -116,7 +116,7 @@ def processAlgorithm(self, progress):
             self.DIST_METHOD)]))
         commands.append('-thresh')
         commands.append(str(self.getParameterValue(self.THRESHOLD)))
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
         commands.append('-du')
         commands.append(self.getOutputValue(self.DIST_UP_GRID))
diff --git a/python/plugins/processing/algs/taudem/dinftranslimaccum.py b/python/plugins/processing/algs/taudem/dinftranslimaccum.py
@@ -103,7 +103,7 @@ def processAlgorithm(self, progress):
         if param is not None:
             commands.append('-o')
             commands.append(param)
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
 
         commands.append('-tla')
diff --git a/python/plugins/processing/algs/taudem/dinftranslimaccum2.py b/python/plugins/processing/algs/taudem/dinftranslimaccum2.py
@@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
         if param is not None:
             commands.append('-o')
             commands.append(param)
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
 
         commands.append('-tla')
diff --git a/python/plugins/processing/algs/taudem/dinftranslimaccum2_multi.py b/python/plugins/processing/algs/taudem/dinftranslimaccum2_multi.py
@@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
         if param is not None:
             commands.append('-o')
             commands.append(param)
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
 
         commands.append('-tla')
diff --git a/python/plugins/processing/algs/taudem/dinftranslimaccum_multi.py b/python/plugins/processing/algs/taudem/dinftranslimaccum_multi.py
@@ -103,7 +103,7 @@ def processAlgorithm(self, progress):
         if param is not None:
             commands.append('-o')
             commands.append(param)
-        if str(self.getParameterValue(self.EDGE_CONTAM)).lower() == 'false':
+        if not self.getParameterValue(self.EDGE_CONTAM):
             commands.append('-nc')
 
         commands.append('-tla')
