[processing] fixed expressions dialog when not in modeler

qgis · Oct 5, 2016 · 2207669 · 2207669
1 parent bc0cdc7
commit 2207669
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/python/plugins/processing/gui/NumberInputPanel.py b/python/plugins/processing/gui/NumberInputPanel.py
@@ -66,6 +66,7 @@ def __init__(self, param, modelParametersDialog=None):
 
     def showExpressionsBuilder(self):
         context = self.param.expressionContext()
+        dlg = QgsExpressionBuilderDialog(None, self.leText.text(), self, 'generic', context)
         if self.modelParametersDialog is not None:
             context.popScope()
             values = self.modelParametersDialog.getAvailableValuesOfType(ParameterNumber, OutputNumber)
@@ -102,10 +103,8 @@ def showExpressionsBuilder(self):
                     variables['%s_max' % name] = "Maximum value of %s" % desc
                     variables['%s_avg' % name] = "Mean value of %s" % desc
                     variables['%s_stddev' % name] = "Standard deviation of %s" % desc
-
-        dlg = QgsExpressionBuilderDialog(None, self.leText.text(), self, 'generic', context)
-        for variable, desc in list(variables.items()):
-            dlg.expressionBuilder().registerItem("Modeler", variable, "@" + variable, desc, highlightedItem=True)
+            for variable, desc in variables.iteritems():
+                dlg.expressionBuilder().registerItem("Modeler", variable, "@" + variable, desc, highlightedItem=True)
         dlg.setWindowTitle(self.tr('Expression based input'))
         if dlg.exec_() == QDialog.Accepted:
             exp = QgsExpression(dlg.expressionText())