sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[BUGFIX][Processing] RScript: Insert None value as NULL

Browse Source
This commit is contained in:
rldhont 2016-06-06 15:18:10 +02:00
parent 2a746f493f
commit 021da12c9f
1 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/plugins/processing/algs/r/RAlgorithm.py
View File

@ -373,6 +373,9 @@ class RAlgorithm(GeoAlgorithm):
for param in self.parameters:
if isinstance(param, ParameterRaster):
if param.value is None:
commands.append(param.name + '= NULL')
else:
value = param.value
value = value.replace('\\', '/')
if self.passFileNames:
@ -384,6 +387,9 @@ class RAlgorithm(GeoAlgorithm):
commands.append(param.name + ' = ' + 'readGDAL("' + value
+ '")')
elif isinstance(param, ParameterVector):
if param.value is None:
commands.append(param.name + '= NULL')
else:
value = param.getSafeExportedLayer()
value = value.replace('\\', '/')
filename = os.path.basename(value)
@ -395,6 +401,9 @@ class RAlgorithm(GeoAlgorithm):
commands.append(param.name + ' = readOGR("' + folder
+ '",layer="' + filename + '")')
elif isinstance(param, ParameterTable):
if param.value is None:
commands.append(param.name + '= NULL')
else:
value = param.value
if not value.lower().endswith('csv'):
raise GeoAlgorithmExecutionException(
@ -413,11 +422,20 @@ class RAlgorithm(GeoAlgorithm):
else:
commands.append(param.name + ' = NULL')
elif isinstance(param, ParameterCrs):
if param.value is None:
commands.append(param.name + '= NULL')
else:
commands.append(param.name + ' = "' + param.value + '"')
elif isinstance(param, (ParameterTableField, ParameterTableMultipleField, ParameterString,
ParameterFile)):
if param.value is None:
commands.append(param.name + '= NULL')
else:
commands.append(param.name + '="' + param.value + '"')
elif isinstance(param, (ParameterNumber, ParameterSelection)):
if param.value is None:
commands.append(param.name + '= NULL')
else:
commands.append(param.name + '=' + unicode(param.value))
elif isinstance(param, ParameterBoolean):
if param.value: