[processing] throw error if no layers selected in raster calculator

algorithm (refs #17920)
qgis · Jan 23, 2018 · c09c301 · c09c301 · nirvn · Feb 8, 2018
1 parent d7e1813
commit c09c301
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/python/plugins/processing/algs/qgis/RasterCalculator.py b/python/plugins/processing/algs/qgis/RasterCalculator.py
@@ -118,9 +118,12 @@ def displayName(self):
     def processAlgorithm(self, parameters, context, feedback):
         expression = self.parameterAsString(parameters, self.EXPRESSION, context)
         layers = self.parameterAsLayerList(parameters, self.LAYERS, context)
+
+        if not layers:
+            raise QgsProcessingException(self.tr("No layers selected"))
+
         layersDict = {}
-        if layers:
-            layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
+        layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
 
         for lyr in QgsProcessingUtils.compatibleRasterLayers(context.project()):
             name = lyr.name()
@@ -142,15 +145,13 @@ def processAlgorithm(self, parameters, context, feedback):
             bbox = QgsProcessingUtils.combineLayerExtents(layers)
 
         if bbox.isNull():
-            if layersDict:
-                bbox = list(layersDict.values())[0].extent()
-                for lyr in layersDict.values():
-                    bbox.combineExtentWith(lyr.extent())
-            else:
-                raise QgsProcessingException(self.tr("No layers selected"))
+            bbox = list(layersDict.values())[0].extent()
+            for lyr in layersDict.values():
+                bbox.combineExtentWith(lyr.extent())
 
         def _cellsize(layer):
             return (layer.extent().xMaximum() - layer.extent().xMinimum()) / layer.width()
+
         cellsize = self.parameterAsDouble(parameters, self.CELLSIZE, context) or min([_cellsize(lyr) for lyr in layersDict.values()])
         width = math.floor((bbox.xMaximum() - bbox.xMinimum()) / cellsize)
         height = math.floor((bbox.yMaximum() - bbox.yMinimum()) / cellsize)