Skip to content

Commit dd68c33

Browse files
alexbruyalexbruy
committedFeb 29, 2016
[processing] add support for ParameterPoint to major algorothm providers
·
ltr-3_40archive/master_2
1 parent 841de7e commit dd68c33

File tree

7 files changed

+59
-9
lines changed

7 files changed

+59
-9
lines changed
 

‎python/plugins/processing/algs/grass/GrassAlgorithm.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,22 @@
4242
from processing.core.ProcessingLog import ProcessingLog
4343
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4444

45-
from processing.core.parameters import getParameterFromString, ParameterVector, ParameterMultipleInput, ParameterExtent, ParameterNumber, ParameterSelection, ParameterRaster, ParameterTable, ParameterBoolean, ParameterString
46-
from processing.core.outputs import getOutputFromString, OutputRaster, OutputVector, OutputFile, OutputHTML
45+
from processing.core.parameters import (getParameterFromString,
46+
ParameterVector,
47+
ParameterMultipleInput,
48+
ParameterExtent,
49+
ParameterNumber,
50+
ParameterSelection,
51+
ParameterRaster,
52+
ParameterTable,
53+
ParameterBoolean,
54+
ParameterString,
55+
ParameterPoint)
56+
from processing.core.outputs import (getOutputFromString,
57+
OutputRaster,
58+
OutputVector,
59+
OutputFile,
60+
OutputHTML)
4761

4862
from GrassUtils import GrassUtils
4963

@@ -332,6 +346,8 @@ def processAlgorithm(self, progress):
332346
command += ' ' + param.name + '=' + unicode(param.options[idx])
333347
elif isinstance(param, ParameterString):
334348
command += ' ' + param.name + '="' + unicode(param.value) + '"'
349+
elif isinstance(param, ParameterPoint):
350+
command += ' ' + param.name + '=' + unicode(param.value)
335351
else:
336352
command += ' ' + param.name + '="' + unicode(param.value) + '"'
337353

‎python/plugins/processing/algs/grass/description/r.lake.coords.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ r.lake.coords - Fills lake at given point to given level.
33
Raster (r.*)
44
ParameterRaster|dem|Elevation|False
55
ParameterNumber|wl|Water level|None|None|1000.0
6-
ParameterString|xy|Seed point coordinates|0,0
6+
ParameterPoint|xy|Seed point coordinates|
77
ParameterBoolean|-n|Use negative depth values for lake raster layer|False
88
OutputRaster|lake|Lake

‎python/plugins/processing/algs/grass7/Grass7Algorithm.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,22 @@
4141
from processing.core.ProcessingLog import ProcessingLog
4242
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4343

44-
from processing.core.parameters import getParameterFromString, ParameterVector, ParameterMultipleInput, ParameterExtent, ParameterNumber, ParameterSelection, ParameterRaster, ParameterTable, ParameterBoolean, ParameterString
45-
from processing.core.outputs import getOutputFromString, OutputRaster, OutputVector, OutputFile, OutputHTML
44+
from processing.core.parameters import (getParameterFromString,
45+
ParameterVector,
46+
ParameterMultipleInput,
47+
ParameterExtent,
48+
ParameterNumber,
49+
ParameterSelection,
50+
ParameterRaster,
51+
ParameterTable,
52+
ParameterBoolean,
53+
ParameterString,
54+
ParameterPoint)
55+
from processing.core.outputs import (getOutputFromString,
56+
OutputRaster,
57+
OutputVector,
58+
OutputFile,
59+
OutputHTML)
4660

4761
from Grass7Utils import Grass7Utils
4862

@@ -390,6 +404,8 @@ def processCommand(self):
390404
command += ' ' + param.name + '=' + unicode(param.options[idx])
391405
elif isinstance(param, ParameterString):
392406
command += ' ' + param.name + '="' + unicode(param.value) + '"'
407+
elif isinstance(param, ParameterPoint):
408+
command += ' ' + param.name + '=' + unicode(param.value)
393409
else:
394410
command += ' ' + param.name + '="' + unicode(param.value) + '"'
395411

‎python/plugins/processing/algs/grass7/description/r.water.outlet.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ r.water.outlet
22
Watershed basin creation program.
33
Raster (r.*)
44
ParameterRaster|input|Name of input raster map|False
5-
ParameterString|coordinates|Coordinates of outlet point|
5+
ParameterPoint|coordinates|Coordinates of outlet point|
66
OutputRaster|output|Basin

‎python/plugins/processing/algs/r/RAlgorithm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
from processing.core.parameters import ParameterTableField
4545
from processing.core.parameters import ParameterExtent
4646
from processing.core.parameters import ParameterFile
47+
from processing.core.parameters import ParameterPoint
4748
from processing.core.outputs import OutputTable
4849
from processing.core.outputs import OutputVector
4950
from processing.core.outputs import OutputRaster
@@ -199,6 +200,8 @@ def processParameterLine(self, line):
199200
param = ParameterTableField(tokens[0], tokens[0], field)
200201
elif tokens[1].lower().strip() == 'extent':
201202
param = ParameterExtent(tokens[0], desc)
203+
elif tokens[1].lower().strip() == 'point':
204+
param = ParameterPoint(tokens[0], desc)
202205
elif tokens[1].lower().strip() == 'file':
203206
param = ParameterFile(tokens[0], desc, False)
204207
elif tokens[1].lower().strip() == 'folder':

‎python/plugins/processing/algs/saga/SagaAlgorithm212.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,24 @@
3535
from processing.core.ProcessingConfig import ProcessingConfig
3636
from processing.core.ProcessingLog import ProcessingLog
3737
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
38-
from processing.core.parameters import getParameterFromString, ParameterExtent, ParameterRaster, ParameterVector, ParameterTable, ParameterMultipleInput, ParameterBoolean, ParameterFixedTable, ParameterNumber, ParameterSelection
39-
from processing.core.outputs import getOutputFromString, OutputTable, OutputVector, OutputRaster
40-
import SagaUtils
38+
from processing.core.parameters import (getParameterFromString,
39+
ParameterExtent,
40+
ParameterRaster,
41+
ParameterVector,
42+
ParameterTable,
43+
ParameterMultipleInput,
44+
ParameterBoolean,
45+
ParameterFixedTable,
46+
ParameterNumber,
47+
ParameterSelection)
48+
from processing.core.outputs import (getOutputFromString,
49+
OutputTable,
50+
OutputVector,
51+
OutputRaster)
4152
from processing.tools import dataobjects
4253
from processing.tools.system import getTempFilename, getTempFilenameInTempFolder
4354
from processing.algs.saga.SagaNameDecorator import *
55+
import SagaUtils
4456

4557
pluginPath = os.path.normpath(os.path.join(
4658
os.path.split(os.path.dirname(__file__))[0], os.pardir))

‎python/plugins/processing/script/ScriptAlgorithm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
from processing.core.parameters import ParameterTableField
4242
from processing.core.parameters import ParameterExtent
4343
from processing.core.parameters import ParameterFile
44+
from processing.core.parameters import ParameterPoint
4445
from processing.core.parameters import getParameterFromString
4546
from processing.core.outputs import OutputTable
4647
from processing.core.outputs import OutputVector
@@ -223,6 +224,8 @@ def processInputParameterToken(self, token, name):
223224
param = ParameterBoolean(name, descName)
224225
elif token.lower().strip() == 'extent':
225226
param = ParameterExtent(name, descName)
227+
elif token.lower().strip() == 'point':
228+
param = ParameterPoint(name, descName)
226229
elif token.lower().strip() == 'file':
227230
param = ParameterFile(name, descName, False)
228231
elif token.lower().strip() == 'folder':

0 commit comments

Comments
 (0)
Please sign in to comment.