(WIP) better cellsize suport

Médéric Ribreux · Médéric RIBREUX · commit f32bba44562b · 2017-11-04T15:31:21.000+01:00
diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -263,34 +263,42 @@ def defineCharacteristicsFromFile(self):
             self.params.append(param)
 
     def getDefaultCellSize(self, parameters, context):
+        """
+        Determine a default cell size from all the raster layers.
+        """
+        if self.cellSize:
+            return True
+        
         cellsize = 0
-        for param in self.parameterDefinitions():
-            if param.name() in parameters:
-                value = parameters[param.name()]
-                if isinstance(param, QgsProcessingParameterRasterLayer):
-                    layer =  self.parameterAsExtent(parameters, paramName, context)
-                    #if isinstance(value, QgsRasterLayer):
-                    #    layer = value
-                    #else:
-                    #    layer = QgsProcessingUtils.mapLayerFromString(param.value, context)
-                    cellsize = max(cellsize, (layer.extent().xMaximum() -
-                                              layer.extent().xMinimum()) /
-                                   layer.width())
-                elif isinstance(param, QgsProcessingParameterMultipleLayers):
-                    # TODO: finish
-                    layers = value.split(';')
-                    for layername in layers:
-                        layer = QgsProcessingUtils.mapLayerFromString(layername, context)
-                        if isinstance(layer, QgsRasterLayer):
-                            cellsize = max(cellsize, (
-                                layer.extent().xMaximum() -
-                                layer.extent().xMinimum()) /
-                                layer.width()
-                            )
-
+        parameters = [p for p in self.parameterDefinitions()
+                      if isinstance(p, (QgsProcessingParameterRasterLayer,
+                                       QgsProcessingParameterMultipleLayers))]
+        cz = lambda l, cellsize: max(cellsize, (l.extent().xMaximum() - l.extent().xMinimum()) / l.width())
+        
+        for param in parameters:
+            paramName = param.name()
+            if isinstance(param, QgsProcessingParameterRasterLayer):
+                layer =  self.parameterAsExtent(parameters, paramName, context)
+                cellsize = max(cellsize, (layer.extent().xMaximum() -
+                                          layer.extent().xMinimum()) /
+                               layer.width())
+                #cellsize = cz(layer, cellsize)
+            elif isinstance(param, QgsProcessingParameterMultipleLayers):
+                layers = self.parameterAsLayerList(parameters, paramName, context)
+                for layer in layers:
+                    if layer.type() == QgsMapLayer.RasterLayer:
+                        #cellsize = cz(layer, cellsize)
+                        cellsize = max(cellsize, (
+                            layer.extent().xMaximum() -
+                            layer.extent().xMinimum()) /
+                            layer.width())
+
+        QgsMessageLog.logMessage('cellSize: {}'.format(cellsize), 'Grass7', QgsMessageLog.INFO)                
         if cellsize == 0:
-            cellsize = 100
-        return cellsize
+            return False
+        else:
+            self.cellSize = cellsize
+            return True
 
     def grabDefaultGrassParameters(self, parameters, context):
         """
@@ -475,10 +483,11 @@ def processInputs(self, parameters, context):
             self.region.yMaximum(), self.region.yMinimum(),
             self.region.xMaximum(), self.region.xMinimum()
         )
-        # TODO Handle cell size
-        #if not self.cellSize:
-        #    self.cellSize = self.getDefaultCellSize(parameters, context)
-        #command += ' res={}'.format(self.cellSize)
+        # Handle cell size
+        if self.getDefaultCellSize(parameters, context):
+            command += ' res={}'.format(self.cellSize)
+        
+        # Handle align to resolution
         if self.alignToResolution:
             command += ' -a'
 
