Skip to content

Commit

Permalink
fix indentation and typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed May 13, 2016
1 parent 730c580 commit 0c8f6f7
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 32 deletions.
3 changes: 1 addition & 2 deletions python/plugins/processing/gui/AlgorithmDialog.py
View file
Expand Up @@ -128,12 +128,11 @@ def evaluateExpression(self, text):
exp = QgsExpression(text) exp = QgsExpression(text)
if exp.hasParserError(): if exp.hasParserError():
raise Exception(exp.parserErrorString()) raise Exception(exp.parserErrorString())
result = exp.evaluate(context) result = exp.evaluate(context)
if exp.hasEvalError(): if exp.hasEvalError():
raise ValueError(exp.evalErrorString()) raise ValueError(exp.evalErrorString())
return result return result



def setParamValue(self, param, widget, alg=None): def setParamValue(self, param, widget, alg=None):
if isinstance(param, ParameterRaster): if isinstance(param, ParameterRaster):
return param.setValue(widget.getValue()) return param.setValue(widget.getValue())
Expand Down
50 changes: 27 additions & 23 deletions python/plugins/processing/gui/NumberInputPanel.py
View file
Expand Up @@ -32,9 +32,13 @@
from PyQt.QtGui import QDialog from PyQt.QtGui import QDialog


from math import log10, floor from math import log10, floor
from qgis.core import (QgsDataSourceURI, QgsCredentials, QgsExpressionContext, from qgis.core import (QgsDataSourceURI,
QgsExpressionContextUtils, QgsExpression, QgsRasterLayer, QgsCredentials,
QgsExpressionContextScope) QgsExpressionContext,
QgsExpressionContextUtils,
QgsExpression,
QgsRasterLayer,
QgsExpressionContextScope)
from qgis.gui import QgsEncodingFileDialog, QgsExpressionBuilderDialog from qgis.gui import QgsEncodingFileDialog, QgsExpressionBuilderDialog
from qgis.utils import iface from qgis.utils import iface
from processing.tools import dataobjects from processing.tools import dataobjects
Expand Down Expand Up @@ -89,12 +93,12 @@ def __init__(self, number, minimum, maximum, isInteger):


def showExpressionsBuilder(self): def showExpressionsBuilder(self):
context = self.expressionContext() context = self.expressionContext()
dlg = QgsExpressionBuilderDialog(None, self.spnValue.text(), self, "generic", context) dlg = QgsExpressionBuilderDialog(None, self.spnValue.text(), self, 'generic', context)
dlg.setWindowTitle(self.tr("Expression based input")); dlg.setWindowTitle(self.tr('Expression based input'))
if dlg.exec_() == QDialog.Accepted: if dlg.exec_() == QDialog.Accepted:
exp = QgsExpression(dlg.expressionText()) exp = QgsExpression(dlg.expressionText())
if not exp.hasParserError(): if not exp.hasParserError():
result = exp.evaluate(context) result = exp.evaluate(context)
if not exp.hasEvalError(): if not exp.hasEvalError():
try: try:
self.spnValue.setValue(float(result)) self.spnValue.setValue(float(result))
Expand All @@ -109,35 +113,35 @@ def expressionContext(self):
layers = dataobjects.getAllLayers() layers = dataobjects.getAllLayers()
for layer in layers: for layer in layers:
name = layer.name() name = layer.name()
processingScope.setVariable("%s_minx" % name, layer.extent().xMinimum()) processingScope.setVariable('%s_minx' % name, layer.extent().xMinimum())
processingScope.setVariable("%s_miny" % name, layer.extent().yMinimum()) processingScope.setVariable('%s_miny' % name, layer.extent().yMinimum())
processingScope.setVariable("%s_maxx" % name, layer.extent().xMaximum()) processingScope.setVariable('%s_maxx' % name, layer.extent().xMaximum())
processingScope.setVariable("%s_maxy" % name, layer.extent().yMaximum()) processingScope.setVariable('%s_maxy' % name, layer.extent().yMaximum())
if isinstance(layer, QgsRasterLayer): if isinstance(layer, QgsRasterLayer):
cellsize = (layer.extent().xMaximum() cellsize = (layer.extent().xMaximum()
- layer.extent().xMinimum()) / layer.width() - layer.extent().xMinimum()) / layer.width()
processingScope.setVariable("%s_cellsize" % name, cellsize) processingScope.setVariable('%s_cellsize' % name, cellsize)


layers = dataobjects.getRasterLayers() layers = dataobjects.getRasterLayers()
for layer in layers: for layer in layers:
for i in range(layer.bandCount()): for i in range(layer.bandCount()):
stats = layer.dataProvider().bandStatistics(i + 1) stats = layer.dataProvider().bandStatistics(i + 1)
processingScope.setVariable("%s_band%i_avg" % (name, i + 1), stats.mean) processingScope.setVariable('%s_band%i_avg' % (name, i + 1), stats.mean)
processingScope.setVariable("%s_band%i_stddev" % (name, i + 1), stats.stdDev) processingScope.setVariable('%s_band%i_stddev' % (name, i + 1), stats.stdDev)
processingScope.setVariable("%s_band%i_min" % (name, i + 1), stats.minimumValue) processingScope.setVariable('%s_band%i_min' % (name, i + 1), stats.minimumValue)
processingScope.setVariable("%s_band%i_max" % (name, i + 1), stats.maximumValue) processingScope.setVariable('%s_band%i_max' % (name, i + 1), stats.maximumValue)


extent = iface.mapCanvas().extent() extent = iface.mapCanvas().extent()
processingScope.setVariable("canvasextent_minx", extent.xMinimum()) processingScope.setVariable('canvasextent_minx', extent.xMinimum())
processingScope.setVariable("canvasextent_miny", extent.yMinimum()) processingScope.setVariable('canvasextent_miny', extent.yMinimum())
processingScope.setVariable("canvasextent_maxx", extent.xMaximum()) processingScope.setVariable('canvasextent_maxx', extent.xMaximum())
processingScope.setVariable("canvasextent_maxy", extent.yMaximum()) processingScope.setVariable('canvasextent_maxy', extent.yMaximum())


extent = iface.mapCanvas().fullExtent() extent = iface.mapCanvas().fullExtent()
processingScope.setVariable("fullextent_minx", extent.xMinimum()) processingScope.setVariable('fullextent_minx', extent.xMinimum())
processingScope.setVariable("fullextent_miny", extent.yMinimum()) processingScope.setVariable('fullextent_miny', extent.yMinimum())
processingScope.setVariable("fullextent_maxx", extent.xMaximum()) processingScope.setVariable('fullextent_maxx', extent.xMaximum())
processingScope.setVariable("fullextent_maxy", extent.yMaximum()) processingScope.setVariable('fullextent_maxy', extent.yMaximum())
context.appendScope(processingScope) context.appendScope(processingScope)
return context return context


Expand Down
18 changes: 11 additions & 7 deletions python/plugins/processing/gui/OutputSelectionPanel.py
View file
Expand Up @@ -33,8 +33,12 @@
from qgis.PyQt.QtWidgets import QDialog, QMenu, QAction, QFileDialog from qgis.PyQt.QtWidgets import QDialog, QMenu, QAction, QFileDialog
from qgis.PyQt.QtGui import QCursor from qgis.PyQt.QtGui import QCursor
from qgis.gui import QgsEncodingFileDialog, QgsExpressionBuilderDialog from qgis.gui import QgsEncodingFileDialog, QgsExpressionBuilderDialog
from qgis.core import QgsDataSourceURI, QgsCredentials, QgsExpressionContext,\ from qgis.core import (QgsDataSourceURI,
QgsExpressionContextUtils, QgsExpression, QgsExpressionContextScope QgsCredentials,
QgsExpressionContext,
QgsExpressionContextUtils,
QgsExpression,
QgsExpressionContextScope)


from processing.core.ProcessingConfig import ProcessingConfig from processing.core.ProcessingConfig import ProcessingConfig
from processing.core.outputs import OutputVector from processing.core.outputs import OutputVector
Expand Down Expand Up @@ -107,8 +111,8 @@ def selectOutput(self):
popupMenu.exec_(QCursor.pos()) popupMenu.exec_(QCursor.pos())


def showExpressionsBuilder(self): def showExpressionsBuilder(self):
dlg = QgsExpressionBuilderDialog(None, self.leText.text(), self, "generic", self.expressionContext()) dlg = QgsExpressionBuilderDialog(None, self.leText.text(), self, 'generic', self.expressionContext())
dlg.setWindowTitle(self.tr("Expression based output")); dlg.setWindowTitle(self.tr('Expression based output'))
if dlg.exec_() == QDialog.Accepted: if dlg.exec_() == QDialog.Accepted:
self.leText.setText(dlg.expressionText()) self.leText.setText(dlg.expressionText())


Expand All @@ -117,8 +121,8 @@ def expressionContext(self):
context.appendScope(QgsExpressionContextUtils.globalScope()) context.appendScope(QgsExpressionContextUtils.globalScope())
context.appendScope(QgsExpressionContextUtils.projectScope()) context.appendScope(QgsExpressionContextUtils.projectScope())
processingScope = QgsExpressionContextScope() processingScope = QgsExpressionContextScope()
for param in self.ag.parameters: for param in self.alg.parameters:
processingScope.setVariable("%s_value" % param.name, "") processingScope.setVariable('%s_value' % param.name, '')
context.appendScope(processingScope) context.appendScope(processingScope)
return context return context


Expand Down Expand Up @@ -227,7 +231,7 @@ def getValue(self):
context = self.expressionContext() context = self.expressionContext()
exp = QgsExpression(fileName) exp = QgsExpression(fileName)
if not exp.hasParserError(): if not exp.hasParserError():
result = exp.evaluate(context) result = exp.evaluate(context)
if not exp.hasEvalError(): if not exp.hasEvalError():
fileName = result fileName = result
if fileName.strip() in ['', self.SAVE_TO_TEMP_FILE]: if fileName.strip() in ['', self.SAVE_TO_TEMP_FILE]:
Expand Down

0 comments on commit 0c8f6f7

Please sign in to comment.