From b9f89ae2b162aaca4d37cbac82d9c4f372886bcf Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Sat, 4 Oct 2014 14:02:29 +0300 Subject: [PATCH] [processing] fix algorithm execution --- python/plugins/processing/algs/qgis/Grid.py | 18 ++++++++++-------- .../plugins/processing/gui/ParametersDialog.py | 4 ++-- .../script/AddScriptFromFileAction.py | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/python/plugins/processing/algs/qgis/Grid.py b/python/plugins/processing/algs/qgis/Grid.py index d6cd2823732..5954ac83df2 100644 --- a/python/plugins/processing/algs/qgis/Grid.py +++ b/python/plugins/processing/algs/qgis/Grid.py @@ -25,6 +25,8 @@ __copyright__ = '(C) 2010, Michael Minn' __revision__ = '$Format:%H$' +import math + from PyQt4.QtCore import * from qgis.core import * from processing.core.GeoAlgorithm import GeoAlgorithm @@ -132,8 +134,8 @@ class Grid(GeoAlgorithm): hSpacing, vSpacing): ft = QgsFeature() - columns = int(floor(float(width) / hSpacing)) - rows = int(floor(float(height) / vSpacing)) + columns = int(math.floor(float(width) / hSpacing)) + rows = int(math.floor(float(height) / vSpacing)) # Longitude lines for col in xrange(0, columns + 1): @@ -163,8 +165,8 @@ class Grid(GeoAlgorithm): hSpacing, vSpacing): ft = QgsFeature() - columns = int(floor(float(width) / hSpacing)) - rows = int(floor(float(height) / vSpacing)) + columns = int(math.floor(float(width) / hSpacing)) + rows = int(math.floor(float(height) / vSpacing)) for col in xrange(0, columns): # (column + 1) and (row + 1) calculation is used to maintain @@ -194,8 +196,8 @@ class Grid(GeoAlgorithm): halfHSpacing = hSpacing / 2 halfVSpacing = vSpacing / 2 - columns = int(floor(float(width) / halfHSpacing)) - rows = int(floor(float(height) / vSpacing)) + columns = int(math.floor(float(width) / halfHSpacing)) + rows = int(math.floor(float(height) / vSpacing)) for col in xrange(0, columns): x1 = originX + ((col + 0) * halfHSpacing) @@ -234,8 +236,8 @@ class Grid(GeoAlgorithm): halfVSpacing = vSpacing / 2 - columns = int(floor(float(width) / hSpacing)) - rows = int(floor(float(height) / vSpacing)) + columns = int(math.floor(float(width) / hSpacing)) + rows = int(math.floor(float(height) / vSpacing)) for col in xrange(0, columns): # (column + 1) and (row + 1) calculation is used to maintain diff --git a/python/plugins/processing/gui/ParametersDialog.py b/python/plugins/processing/gui/ParametersDialog.py index a4b340fac56..e6dfeeafc26 100644 --- a/python/plugins/processing/gui/ParametersDialog.py +++ b/python/plugins/processing/gui/ParametersDialog.py @@ -36,11 +36,11 @@ class ParametersDialog(AlgorithmExecutionDialog): NOT_SELECTED = QtCore.QCoreApplication.translate('ParametersDialog', '[Not selected]') def __init__(self, alg): - AlgorithmExecutionDialog.__init__(self, alg, self.scrollArea) - self.paramTable = ParametersPanel(self, alg) self.scrollArea = QtGui.QScrollArea() self.scrollArea.setFrameShape(QtGui.QFrame.NoFrame); self.scrollArea.setWidget(self.paramTable) self.scrollArea.setWidgetResizable(True) self.executed = False + + AlgorithmExecutionDialog.__init__(self, alg, self.scrollArea) diff --git a/python/plugins/processing/script/AddScriptFromFileAction.py b/python/plugins/processing/script/AddScriptFromFileAction.py index 68340a7cb22..0261378f283 100644 --- a/python/plugins/processing/script/AddScriptFromFileAction.py +++ b/python/plugins/processing/script/AddScriptFromFileAction.py @@ -44,7 +44,7 @@ class AddScriptFromFileAction(ToolboxAction): def execute(self): filename = QtGui.QFileDialog.getOpenFileName(self.toolbox, self.tr('Script files', 'AddScriptFromFileAction'), None, - self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction')) + self.tr('Script files (*.py *.PY)', 'AddScriptFromFileAction')) if filename: try: script = ScriptAlgorithm(filename)