sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit c09c3018035eb7a4f47acbde7f3dae405ba444db.
This commit is contained in:
Alexander Bruy 2018-02-08 13:25:20 +02:00
parent b6ff401452
commit fcb50a6857
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
python/plugins/processing/algs/qgis/RasterCalculator.py
View File

@ -118,12 +118,9 @@ class RasterCalculator(QgisAlgorithm):
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 = {}
layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
if layers:
layersDict = {os.path.basename(lyr.source().split(".")[0]): lyr for lyr in layers}
for lyr in QgsProcessingUtils.compatibleRasterLayers(context.project()):
name = lyr.name()
@ -145,13 +142,15 @@ class RasterCalculator(QgisAlgorithm):
bbox = QgsProcessingUtils.combineLayerExtents(layers)
if bbox.isNull():
bbox = list(layersDict.values())[0].extent()
for lyr in layersDict.values():
bbox.combineExtentWith(lyr.extent())
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"))
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)