[processing] Changed raster calculator to ask main layer separately

volaya · volaya · commit 0e76df60b4e6 · 2014-07-14T00:54:54.000+02:00
diff --git a/python/plugins/processing/algs/saga/RasterCalculator.py b/python/plugins/processing/algs/saga/RasterCalculator.py
@@ -58,22 +58,22 @@ def defineCharacteristics(self):
         self.name = 'Raster calculator'
         self.cmdname = 'Grid Calculator'
         self.undecoratedGroup = "grid_calculus"
-        self.group = SagaGroupNameDecorator.getDecoratedName(self.undecoratedGroup)
-        grids = ParameterRaster(self.GRIDS, 'Input layers', True)
-        grids.hidden = True
-        self.addParameter(grids)
-        self.addParameter(ParameterMultipleInput(self.XGRIDS, 'Input layers',
+        self.group = SagaGroupNameDecorator.getDecoratedName(self.undecoratedGroup) 
+        self.addParameter(ParameterRaster(self.GRIDS, 'Main input layers'))
+        self.addParameter(ParameterMultipleInput(self.XGRIDS, 'Additional layers',
                           ParameterMultipleInput.TYPE_RASTER, False))
         self.addParameter(ParameterString(self.FORMULA, "Formula"))
         self.addOutput(OutputRaster(self.RESULT, "Result"))
 
 
-    def processAlgorithm(self, progress):
-        xgrids = self.getParameterValue(self.XGRIDS)
-        layers = xgrids.split(';')
-        grid = layers[0]
-        self.setParameterValue(self.GRIDS, grid)
-        xgrids = ";".join(layers[1:])
-        if xgrids == "": xgrids = None
-        self.setParameterValue(self.XGRIDS, xgrids)
-        SagaAlgorithm.processAlgorithm(self, progress)
+    #===========================================================================
+    # def processAlgorithm(self, progress):
+    #     xgrids = self.getParameterValue(self.XGRIDS)
+    #     layers = xgrids.split(';')
+    #     grid = layers[0]
+    #     self.setParameterValue(self.GRIDS, grid)
+    #     xgrids = ";".join(layers[1:])
+    #     if xgrids == "": xgrids = None
+    #     self.setParameterValue(self.XGRIDS, xgrids)
+    #     SagaAlgorithm.processAlgorithm(self, progress)
+    #===========================================================================
