Skip to content

Commit

Permalink
Merge branch 'processing_modeler_default_value'
Browse files Browse the repository at this point in the history
  • Loading branch information
rldhont committed Apr 28, 2016
2 parents 93d984e + 4a11a1a commit 37d6c69
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/modeler/ModelerAlgorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ def prepareAlgorithm(self, alg):
iface.messageBar().pushMessage(self.tr("Warning"),
self.tr("Parameter %s in algorithm %s in the model is run with default value! Edit the model to make sure that this is correct.") % (param.name, alg.name),
QgsMessageBar.WARNING, 4)
value = None
value = param.default
if value is None and isinstance(param, ParameterExtent):
value = self.getMinCoveringExtent()
# We allow unexistent filepaths, since that allows
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ def setPreviousValues(self):
if param.name in alg.params:
value = alg.params[param.name]
else:
value = None
value = param.default
if isinstance(param, (
ParameterRaster,
ParameterVector,
Expand Down

0 comments on commit 37d6c69

Please sign in to comment.