Skip to content

Commit

Permalink
[BUGFIX][Processing][Rscript] Use CRS Parameter
Browse files Browse the repository at this point in the history
Add support for CRS parameter to Rscript command.
  • Loading branch information
rldhont committed May 24, 2016
1 parent 9928980 commit f470c53
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions python/plugins/processing/algs/r/RAlgorithm.py
Expand Up @@ -43,6 +43,7 @@
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterTableField
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterCrs
from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterPoint
from processing.core.outputs import OutputTable
Expand Down Expand Up @@ -200,6 +201,8 @@ def processParameterLine(self, line):
param = ParameterTableField(tokens[0], tokens[0], field)
elif tokens[1].lower().strip() == 'extent':
param = ParameterExtent(tokens[0], desc)
elif tokens[1].lower().strip() == 'crs':
param = ParameterCrs(tokens[0], desc)
elif tokens[1].lower().strip() == 'point':
param = ParameterPoint(tokens[0], desc)
elif tokens[1].lower().strip() == 'file':
Expand Down Expand Up @@ -350,6 +353,8 @@ def getImportCommands(self):
commands.append(param.name + ' = extent(' + tokens[0] + ',' + tokens[2] + ',' + tokens[1] + ',' + tokens[3] + ')')
else:
commands.append(param.name + ' = NULL')
elif isinstance(param, ParameterCrs):
commands.append(param.name + ' = "' + param.value + '"')
elif isinstance(param, (ParameterTableField, ParameterString,
ParameterFile)):
commands.append(param.name + '="' + param.value + '"')
Expand Down

0 comments on commit f470c53

Please sign in to comment.