Skip to content

Commit 024f6a1

Browse files
committed
[processing] fix handling of optional string arguments (fix #9109, 9120)
1 parent 92ee039 commit 024f6a1

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

python/plugins/processing/gdal/ClipByExtent.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def defineCharacteristics(self):
6060
'none'))
6161
self.addParameter(ParameterExtent(self.PROJWIN, 'Clipping extent'))
6262
self.addParameter(ParameterString(self.EXTRA,
63-
'Additional creation parameters', ''))
63+
'Additional creation parameters', '', optional=True))
6464
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
6565

6666
def processAlgorithm(self, progress):

python/plugins/processing/gdal/ClipByMask.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def defineCharacteristics(self):
7070
self.addParameter(ParameterBoolean(self.KEEP_RESOLUTION,
7171
'Keep resolution of output raster', False))
7272
self.addParameter(ParameterString(self.EXTRA,
73-
'Additional creation parameters', ''))
73+
'Additional creation parameters', '', optional=True))
7474
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
7575

7676
def processAlgorithm(self, progress):

python/plugins/processing/gdal/contour.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def defineCharacteristics(self):
6464
'Attribute name (if not set, no elevation attribute is attached)',
6565
'ELEV', optional=True))
6666
self.addParameter(ParameterString(self.EXTRA,
67-
'Additional creation parameters', ''))
67+
'Additional creation parameters', '', optional=True))
6868

6969
self.addOutput(OutputVector(self.OUTPUT_VECTOR,
7070
'Output file for contour lines (vector)'))

python/plugins/processing/gdal/translate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def defineCharacteristics(self):
8484
'Copy all subdatasets of this file to individual output files',
8585
False))
8686
self.addParameter(ParameterString(self.EXTRA,
87-
'Additional creation parameters', ''))
87+
'Additional creation parameters', '', optional=True))
8888
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
8989

9090
def processAlgorithm(self, progress):

python/plugins/processing/gdal/warp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def defineCharacteristics(self):
6767
self.addParameter(ParameterSelection(self.METHOD, 'Resampling method',
6868
self.METHOD_OPTIONS))
6969
self.addParameter(ParameterString(self.EXTRA,
70-
'Additional creation parameters', ''))
70+
'Additional creation parameters', '', optional=True))
7171
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
7272

7373
def processAlgorithm(self, progress):

python/plugins/processing/modeler/ModelerParametersDialog.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,8 @@ def setParamStringValue(self, param, widget):
745745
else:
746746
self.params[param.name] = value
747747
else:
748-
if widget.currentText() == '':
749-
return False
748+
#if widget.currentText() == '':
749+
# return False
750750
idx = widget.findText(widget.currentText())
751751
if idx < 0:
752752
name = self.getSafeNameForHarcodedParameter(param)

python/plugins/processing/parameters/ParameterString.py

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ def __init__(self, name='', description='', default='', multiline=False,
4343

4444
def setValue(self, obj):
4545
if obj is None:
46+
if self.optional:
47+
self.value = ''
48+
return True
4649
self.value = self.default
4750
return True
4851
self.value = unicode(obj).replace(ParameterString.ESCAPED_NEWLINE,

0 commit comments

Comments
 (0)