GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 23:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't create a context when it's not provided

Browse Source 
The rest of the functions already assume that None is an empty context
This commit is contained in:
Jaime van Kessel 2020-08-14 14:02:59 +02:00
parent 4c00a8ff2c
commit 51737dccd6
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cura/Settings/ExtruderStack.py
View File

@ -131,13 +131,13 @@ class ExtruderStack(CuraContainerStack):
if not self._next_stack:
raise Exceptions.NoGlobalStackError("Extruder {id} is missing the next stack!".format(id = self.id))
if context is None:
context = PropertyEvaluationContext()
context.pushContainer(self)
if context:
context.pushContainer(self)
if not super().getProperty(key, "settable_per_extruder", context):
result = self.getNextStack().getProperty(key, property_name, context)
context.popContainer()
if context:
context.popContainer()
return result
limit_to_extruder = super().getProperty(key, "limit_to_extruder", context)
@ -150,13 +150,15 @@ class ExtruderStack(CuraContainerStack):
try:
result = self.getNextStack().extruderList[int(limit_to_extruder)].getProperty(key, property_name, context)
if result is not None:
context.popContainer()
if context:
context.popContainer()
return result
except IndexError:
pass
result = super().getProperty(key, property_name, context)
context.popContainer()
if context:
context.popContainer()
return result
@override(CuraContainerStack)

13
cura/Settings/GlobalStack.py
View File

@ -192,7 +192,7 @@ class GlobalStack(CuraContainerStack):
self._extruders[position] = extruder
self.extrudersChanged.emit()
Logger.log("i", "Extruder[%s] added to [%s] at position [%s]", extruder.id, self.id, position)
@override(ContainerStack)
def getProperty(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> Any:
"""Overridden from ContainerStack
@ -211,9 +211,8 @@ class GlobalStack(CuraContainerStack):
if not self.definition.findDefinitions(key = key):
return None
if context is None:
context = PropertyEvaluationContext()
context.pushContainer(self)
if context:
context.pushContainer(self)
# Handle the "resolve" property.
#TODO: Why the hell does this involve threading?
@ -238,13 +237,15 @@ class GlobalStack(CuraContainerStack):
if super().getProperty(key, "settable_per_extruder", context):
result = self._extruders[str(limit_to_extruder)].getProperty(key, property_name, context)
if result is not None:
context.popContainer()
if context:
context.popContainer()
return result
else:
Logger.log("e", "Setting {setting} has limit_to_extruder but is not settable per extruder!", setting = key)
result = super().getProperty(key, property_name, context)
context.popContainer()
if context:
context.popContainer()
return result
@override(ContainerStack)