Skip to content
Permalink
Browse files

[BUGFIX][Processing][Rscript] Use Extent Parameter

Add support for extent parameter to Rscript command.
  • Loading branch information
rldhont committed May 24, 2016
1 parent 2bba191 commit 5d7e218b042121e4c1c22f42ff1f2a61fb480241
Showing with 8 additions and 2 deletions.
  1. +8 −2 python/plugins/processing/algs/r/RAlgorithm.py
@@ -323,7 +323,7 @@ def getImportCommands(self):
else:
commands.append(param.name + ' = ' + 'readGDAL("' + value
+ '")')
if isinstance(param, ParameterVector):
elif isinstance(param, ParameterVector):
value = param.getSafeExportedLayer()
value = value.replace('\\', '/')
filename = os.path.basename(value)
@@ -334,7 +334,7 @@ def getImportCommands(self):
else:
commands.append(param.name + ' = readOGR("' + folder
+ '",layer="' + filename + '")')
if isinstance(param, ParameterTable):
elif isinstance(param, ParameterTable):
value = param.value
if not value.lower().endswith('csv'):
raise GeoAlgorithmExecutionException(
@@ -344,6 +344,12 @@ def getImportCommands(self):
else:
commands.append(param.name + ' <- read.csv("' + value
+ '", head=TRUE, sep=",")')
elif isinstance(param, ParameterExtent):
if param.value:
tokens = unicode(param.value).split(',')
commands.append(param.name + ' = extent(' + tokens[0] + ',' + tokens[2] + ',' + tokens[1] + ',' + tokens[3] + ')')
else:
commands.append(param.name + ' = NULL')
elif isinstance(param, (ParameterTableField, ParameterString,
ParameterFile)):
commands.append(param.name + '="' + param.value + '"')

0 comments on commit 5d7e218

Please sign in to comment.
You can’t perform that action at this time.