Skip to content

Commit 0a7e69c

Browse files
committed
[processing] Add [not set] option for field combos when parent layer changes (fix #10728), also fix some strings displaying with extra spaces
1 parent 4d6cfd9 commit 0a7e69c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

python/plugins/processing/algs/gdal/warp.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ def defineCharacteristics(self):
5656
self.addParameter(ParameterCrs(self.DEST_SRS,
5757
'Destination SRS (EPSG Code)', 'EPSG:4326'))
5858
self.addParameter(ParameterNumber(self.TR,
59-
'Output file resolution in target georeferenced units \
60-
(leave 0 for no change)', 0.0, None, 0.0))
59+
'Output file resolution in target georeferenced units (leave 0 for no change)',
60+
0.0, None, 0.0))
6161
self.addParameter(ParameterSelection(self.METHOD, 'Resampling method',
6262
self.METHOD_OPTIONS))
6363
self.addParameter(ParameterString(self.EXTRA,

python/plugins/processing/algs/qgis/ftools/ConvexHull.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ def defineCharacteristics(self):
5353
self.addParameter(ParameterVector(ConvexHull.INPUT, 'Input layer',
5454
[ParameterVector.VECTOR_TYPE_ANY]))
5555
self.addParameter(ParameterTableField(ConvexHull.FIELD,
56-
'Field (optional, only used if creating convex \
57-
hulls by classes)', ConvexHull.INPUT, optional=True))
56+
'Field (optional, only used if creating convex hulls by classes)',
57+
ConvexHull.INPUT, optional=True))
5858
self.addParameter(ParameterSelection(ConvexHull.METHOD, 'Method',
5959
ConvexHull.METHODS))
6060
self.addOutput(OutputVector(ConvexHull.OUTPUT, 'Convex hull'))

python/plugins/processing/gui/ParametersPanel.py

+2
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@ def updateDependentFields(self):
327327
for child in children:
328328
widget = self.valueItems[child]
329329
widget.clear()
330+
if self.alg.getParameterFromName(child).optional:
331+
widget.addItem("[not set]")
330332
widget.addItems(self.getFields(layer,
331333
self.alg.getParameterFromName(child).datatype))
332334

0 commit comments

Comments
 (0)