From 1bc1bb2f13e480d0282e940d63ed7260f72d71eb Mon Sep 17 00:00:00 2001 From: Luigi Pirelli Date: Sat, 21 Jul 2018 18:03:06 +0100 Subject: [PATCH] fix use layer source and managed string parsing in case of translation --- python/plugins/processing/algs/qgis/RasterCalculator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/plugins/processing/algs/qgis/RasterCalculator.py b/python/plugins/processing/algs/qgis/RasterCalculator.py index 4f5f143c3fa..8fd230dad4f 100644 --- a/python/plugins/processing/algs/qgis/RasterCalculator.py +++ b/python/plugins/processing/algs/qgis/RasterCalculator.py @@ -230,7 +230,7 @@ class RasterCalculator(QgisAlgorithm): def mappedNameToLayer(self, lyr, expression, layersDict, context): '''Try to identify if a real layer is mapped in the expression with a symbolic name.''' - nameToMap = lyr.name() + nameToMap = lyr.source() # check for layers directly added in the expression if (nameToMap + "@") in expression: @@ -249,12 +249,12 @@ class RasterCalculator(QgisAlgorithm): varDescription = None for varName in expContextAlgInputsScope.variableNames(): - layer = expContextAlgInputsScope.variable(varName) + layerInContext = expContextAlgInputsScope.variable(varName) - if not isinstance(layer, str) and not isinstance(layer, QgsMapLayer): + if not isinstance(layerInContext, str) and not isinstance(layerInContext, QgsMapLayer): continue - if isinstance(layer, QgsMapLayer) and nameToMap not in layer.source(): + if isinstance(layerInContext, QgsMapLayer) and nameToMap not in layerInContext.source(): continue varDescription = expContextAlgInputsScope.description(varName)