Merge pull request #1492 from nyalldawson/fix_10728

[processing] Fix blocker #10728
qgis · Jun 26, 2014 · 2d1e983 · 2d1e983
2 parents 4d6cfd9 + 0a7e69c
commit 2d1e983
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/plugins/processing/algs/gdal/warp.py b/python/plugins/processing/algs/gdal/warp.py
@@ -56,8 +56,8 @@ def defineCharacteristics(self):
         self.addParameter(ParameterCrs(self.DEST_SRS,
                           'Destination SRS (EPSG Code)', 'EPSG:4326'))
         self.addParameter(ParameterNumber(self.TR,
-            'Output file resolution in target georeferenced units \
-            (leave 0 for no change)', 0.0, None, 0.0))
+            'Output file resolution in target georeferenced units (leave 0 for no change)',
+            0.0, None, 0.0))
         self.addParameter(ParameterSelection(self.METHOD, 'Resampling method',
                           self.METHOD_OPTIONS))
         self.addParameter(ParameterString(self.EXTRA,

diff --git a/python/plugins/processing/algs/qgis/ftools/ConvexHull.py b/python/plugins/processing/algs/qgis/ftools/ConvexHull.py
@@ -53,8 +53,8 @@ def defineCharacteristics(self):
         self.addParameter(ParameterVector(ConvexHull.INPUT, 'Input layer',
                           [ParameterVector.VECTOR_TYPE_ANY]))
         self.addParameter(ParameterTableField(ConvexHull.FIELD,
-                          'Field (optional, only used if creating convex \
-                          hulls by classes)', ConvexHull.INPUT, optional=True))
+                          'Field (optional, only used if creating convex hulls by classes)',
+                          ConvexHull.INPUT, optional=True))
         self.addParameter(ParameterSelection(ConvexHull.METHOD, 'Method',
                           ConvexHull.METHODS))
         self.addOutput(OutputVector(ConvexHull.OUTPUT, 'Convex hull'))

diff --git a/python/plugins/processing/gui/ParametersPanel.py b/python/plugins/processing/gui/ParametersPanel.py
@@ -327,6 +327,8 @@ def updateDependentFields(self):
         for child in children:
             widget = self.valueItems[child]
             widget.clear()
+            if self.alg.getParameterFromName(child).optional:
+                widget.addItem("[not set]")
             widget.addItems(self.getFields(layer,
                             self.alg.getParameterFromName(child).datatype))