Skip to content

Commit 2dbe2da

Browse files
committedOct 7, 2014
[processing] minor code cleaning
1 parent f661f80 commit 2dbe2da

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed
 

‎python/plugins/processing/algs/saga/RasterCalculator.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing.core.parameters import ParameterMultipleInput
20-
from processing.algs.saga.SagaAlgorithm import SagaAlgorithm
21-
from processing.core.GeoAlgorithm import GeoAlgorithm
22-
from processing.core.parameters import ParameterString
23-
from processing.algs.saga.SagaGroupNameDecorator import SagaGroupNameDecorator
19+
2420

2521
__author__ = 'Victor Olaya'
2622
__date__ = 'May 2014'
@@ -34,6 +30,11 @@
3430
from processing.core.parameters import ParameterRaster
3531
from processing.core.outputs import OutputRaster
3632
from processing.tools.system import *
33+
from processing.core.parameters import ParameterMultipleInput
34+
from processing.algs.saga.SagaAlgorithm import SagaAlgorithm
35+
from processing.core.GeoAlgorithm import GeoAlgorithm
36+
from processing.core.parameters import ParameterString
37+
from processing.algs.saga.SagaGroupNameDecorator import SagaGroupNameDecorator
3738

3839

3940
class RasterCalculator(SagaAlgorithm):
@@ -59,21 +60,9 @@ def defineCharacteristics(self):
5960
self.cmdname = 'Grid Calculator'
6061
self.undecoratedGroup = "grid_calculus"
6162
self.group = SagaGroupNameDecorator.getDecoratedName(self.undecoratedGroup)
62-
self.addParameter(ParameterRaster(self.GRIDS, 'Main input layers'))
63+
self.addParameter(ParameterRaster(self.GRIDS, 'Main input layer'))
6364
self.addParameter(ParameterMultipleInput(self.XGRIDS, 'Additional layers',
6465
ParameterMultipleInput.TYPE_RASTER, True))
6566
self.addParameter(ParameterString(self.FORMULA, "Formula"))
6667
self.addOutput(OutputRaster(self.RESULT, "Result"))
6768

68-
69-
#===========================================================================
70-
# def processAlgorithm(self, progress):
71-
# xgrids = self.getParameterValue(self.XGRIDS)
72-
# layers = xgrids.split(';')
73-
# grid = layers[0]
74-
# self.setParameterValue(self.GRIDS, grid)
75-
# xgrids = ";".join(layers[1:])
76-
# if xgrids == "": xgrids = None
77-
# self.setParameterValue(self.XGRIDS, xgrids)
78-
# SagaAlgorithm.processAlgorithm(self, progress)
79-
#===========================================================================

0 commit comments

Comments
 (0)
Please sign in to comment.