Skip to content

Commit fcb50a6

Browse files
committed
Revert "[processing] throw error if no layers selected in raster calculator"
This reverts commit c09c301.
1 parent b6ff401 commit fcb50a6

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

python/plugins/processing/algs/qgis/RasterCalculator.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,9 @@ def displayName(self):
118118
def processAlgorithm(self, parameters, context, feedback):
119119
expression = self.parameterAsString(parameters, self.EXPRESSION, context)
120120
layers = self.parameterAsLayerList(parameters, self.LAYERS, context)
121-
122-
if not layers:
123-
raise QgsProcessingException(self.tr("No layers selected"))
124-
125121
layersDict = {}
126-
layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
122+
if layers:
123+
layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
127124

128125
for lyr in QgsProcessingUtils.compatibleRasterLayers(context.project()):
129126
name = lyr.name()
@@ -145,13 +142,15 @@ def processAlgorithm(self, parameters, context, feedback):
145142
bbox = QgsProcessingUtils.combineLayerExtents(layers)
146143

147144
if bbox.isNull():
148-
bbox = list(layersDict.values())[0].extent()
149-
for lyr in layersDict.values():
150-
bbox.combineExtentWith(lyr.extent())
145+
if layersDict:
146+
bbox = list(layersDict.values())[0].extent()
147+
for lyr in layersDict.values():
148+
bbox.combineExtentWith(lyr.extent())
149+
else:
150+
raise QgsProcessingException(self.tr("No layers selected"))
151151

152152
def _cellsize(layer):
153153
return (layer.extent().xMaximum() - layer.extent().xMinimum()) / layer.width()
154-
155154
cellsize = self.parameterAsDouble(parameters, self.CELLSIZE, context) or min([_cellsize(lyr) for lyr in layersDict.values()])
156155
width = math.floor((bbox.xMaximum() - bbox.xMinimum()) / cellsize)
157156
height = math.floor((bbox.yMaximum() - bbox.yMinimum()) / cellsize)

0 commit comments

Comments
 (0)