sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fix algorithm execution

Browse Source
This commit is contained in:
Alexander Bruy 2014-10-04 14:02:29 +03:00
parent ba3cca2679
commit b9f89ae2b1
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
python/plugins/processing/algs/qgis/Grid.py
View File

@ -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

4
python/plugins/processing/gui/ParametersDialog.py
View File

@ -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)

2
python/plugins/processing/script/AddScriptFromFileAction.py
View File

@ -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)