sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Fix exception when clicking alg with distance param in history dialog

Browse Source
This commit is contained in:
Nyall Dawson 2018-07-02 10:12:27 +10:00
parent cb144b3cfe
commit 1621402652
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/processing/gui/NumberInputPanel.py
View File

@ -143,6 +143,8 @@ class NumberInputPanel(NUMBER_BASE, NUMBER_WIDGET):
super(NumberInputPanel, self).__init__(None)
self.setupUi(self)
self.layer = None
self.spnValue.setExpressionsEnabled(True)
self.param = param
@ -211,7 +213,8 @@ class NumberInputPanel(NUMBER_BASE, NUMBER_WIDGET):
def setDynamicLayer(self, layer):
try:
self.btnDataDefined.setVectorLayer(self.getLayerFromValue(layer))
self.layer = self.getLayerFromValue(layer)
self.btnDataDefined.setVectorLayer(self.layer)
except:
pass
@ -221,7 +224,14 @@ class NumberInputPanel(NUMBER_BASE, NUMBER_WIDGET):
value, ok = value.source.valueAsString(context.expressionContext())
if isinstance(value, str):
value = QgsProcessingUtils.mapLayerFromString(value, context)
return value
if value is None:
return None
# need to return layer with ownership - otherwise layer may be deleted when context
# goes out of scope
new_layer = context.takeResultLayer(value.id())
# if we got ownership, return that - otherwise just return the layer (which may be owned by the project)
return new_layer if new_layer is not None else value
def getValue(self):
if self.btnDataDefined is not None and self.btnDataDefined.isActive():