[processing] more complete scope for expressions in outputs

qgis · Apr 25, 2016 · e9a3089 · e9a3089
1 parent 7805c64
commit e9a3089
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/python/plugins/processing/gui/OutputSelectionPanel.py b/python/plugins/processing/gui/OutputSelectionPanel.py
@@ -108,12 +108,18 @@ def selectOutput(self):
 
     def showExpressionsBuilder(self):
         context = QgsExpressionContext()
-        context.appendScope(QgsExpressionContextUtils.projectScope())
+        context.appendScope(QgsExpressionContextUtils.globalScope())
+        scope = QgsExpressionContextUtils.projectScope()
+        self.addVariablesToScope(scope)
         dlg = QgsExpressionBuilderDialog(None, self.leText.text(), self, "generic", context)
         dlg.setWindowTitle(self.tr("Expression based output"));
         if dlg.exec_() == QDialog.Accepted:
             self.leText.setText(dlg.expressionText())
 
+    def addVariablesToScope(self, scope):
+        for param in self.ag.parameters:
+            scope.setVariable("%s_value" % param.name, "")
+
     def saveToTemporaryFile(self):
         self.leText.setText('')