Skip to content

Commit 8f6ae95

Browse files
committedOct 28, 2012
changed behaviour of pyculator when no selection exist
1 parent 016789a commit 8f6ae95

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed
 

‎python/plugins/sextante/algs/FieldPyculator.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def defineCharacteristics(self):
5555
self.name = "Field Pyculator"
5656
self.group = "Algorithms for vector layers"
5757
self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
58-
self.addParameter(ParameterBoolean(self.USE_SELECTED, "Use only selected features", False))
58+
self.addParameter(ParameterBoolean(self.USE_SELECTED, "Use only selected features (all if noone selected)", False))
5959
self.addParameter(ParameterString(self.FIELD_NAME, "Result field name", "NewField"))
6060
self.addParameter(ParameterString(self.GLOBAL, "Global expression", multiline = True))
6161
self.addParameter(ParameterString(self.FORMULA, "Formula", "value = ", multiline = True))
@@ -116,8 +116,12 @@ def processAlgorithm(self, progress):
116116
(unicode(sys.exc_info()[0].__name__), unicode(sys.exc_info()[1])))
117117

118118

119+
QtGui.QMessageBox.critical(None, "", str(vprovider))
119120
#run
120-
if not useSelected:
121+
122+
features = layer.selectedFeatures()
123+
nFeatures = len(features)
124+
if not useSelected or nFeatures == 0:
121125
feat = QgsFeature()
122126
if need_attrs:
123127
attr_ind = vprovider.attributeIndexes()

‎python/plugins/sextante/modeler/ModelerParametersDialog.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,8 @@ def setParamTableFieldValue(self, param, widget):
579579
return True
580580

581581
def setParamStringValue(self, param, widget):
582+
if widget.currentText() == "":
583+
return False
582584
idx = widget.findText(widget.currentText())
583585
if idx < 0:
584586
name = self.getSafeNameForHarcodedParameter(param)

0 commit comments

Comments
 (0)
Please sign in to comment.