Skip to content

Commit

Permalink
[processing] fixed evaluation of output values
Browse files Browse the repository at this point in the history
  • Loading branch information
volaya committed Oct 5, 2016
1 parent 0ea6629 commit 257faf3
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions python/plugins/processing/core/outputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,11 @@ def resolveValue(self, alg):
self.value = self._resolveTemporary(alg)
else:
exp = QgsExpression(self.value)
if exp.hasParserError():
raise ValueError(self.tr("Error in output expression: ") + exp.parserErrorString())
self.value = exp.evaluate(_expressionContext(alg))
if exp.hasEvalError():
raise ValueError("Error evaluating output expression: " + exp.evalErrorString())
if not exp.hasParserError():
value = exp.evaluate(_expressionContext(alg))
if not exp.hasEvalError():
self.value = value



print self.value
if ":" not in self.value:
if not os.path.isabs(self.value):
self.value = os.path.join(ProcessingConfig.getSetting(ProcessingConfig.OUTPUT_FOLDER),
Expand Down

0 comments on commit 257faf3

Please sign in to comment.