Skip to content

Commit 640f93e

Browse files
committed
[processing] update TauDEM tools to latest TauDEM version
1 parent 19a6a5f commit 640f93e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

python/plugins/processing/algs/taudem/description/dinfconclimaccum.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ ParameterVector|-o|Outlets shapefile|0|True
99
ParameterNumber|-csol|Concentration Threshold|1.0|100.0|1.0
1010
ParameterBoolean|-nc|Check for edge contamination|True
1111
OutputRaster|-ctpt|Concentration Grid
12+
OutputRaster|-q|Overland Flow Specific Discharge Grid

python/plugins/processing/algs/taudem/description/pitremove.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ Pit Remove
22
pitremove
33
Basic Grid Analysis tools
44
ParameterRaster|-z|Elevation Grid|False
5+
ParameterRaster|-depmask|Depresion mask grid|True
6+
ParameterBoolean|-4way|Fill considering only 4 way neighbours|False
57
OutputRaster|-fel|Pit Removed Elevation Grid

python/plugins/processing/algs/taudem/dropanalysis.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
from processing.core.parameters import ParameterRaster
3838
from processing.core.parameters import ParameterVector
3939
from processing.core.parameters import ParameterNumber
40+
from processing.core.parameters import ParameterBoolean
4041
from processing.core.parameters import ParameterSelection
4142
from processing.core.outputs import OutputFile
4243

@@ -57,8 +58,6 @@ class DropAnalysis(GeoAlgorithm):
5758

5859
DROP_ANALYSIS_FILE = 'DROP_ANALYSIS_FILE'
5960

60-
STEPS = ['Logarithmic', 'Linear']
61-
6261
def getIcon(self):
6362
return QIcon(os.path.dirname(__file__) + '/../../images/taudem.svg')
6463

@@ -84,8 +83,8 @@ def defineCharacteristics(self):
8483
self.tr('Maximum Threshold'), 0, None, 500))
8584
self.addParameter(ParameterNumber(self.TRESHOLD_NUM,
8685
self.tr('Number of Threshold Values'), 0, None, 10))
87-
self.addParameter(ParameterSelection(self.STEP_TYPE,
88-
self.tr('Spacing for Threshold Values'), self.STEPS, 0))
86+
self.addParameter(ParameterBoolean(self.STEP_TYPE,
87+
self.tr('Use logarithmic spacing for threshold values'), True))
8988
self.addOutput(OutputFile(self.DROP_ANALYSIS_FILE,
9089
self.tr('D-Infinity Drop to Stream Grid')))
9190

@@ -116,7 +115,7 @@ def processAlgorithm(self, progress):
116115
commands.append(unicode(self.getParameterValue(self.MIN_TRESHOLD)))
117116
commands.append(unicode(self.getParameterValue(self.MAX_THRESHOLD)))
118117
commands.append(unicode(self.getParameterValue(self.TRESHOLD_NUM)))
119-
commands.append(unicode(self.getParameterValue(self.STEPS)))
118+
commands.append(unicode(self.getParameterValue(self.STEP_TYPE)))
120119
commands.append('-drp')
121120
commands.append(self.getOutputValue(self.DROP_ANALYSIS_FILE))
122121

0 commit comments

Comments
 (0)