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

Revert "Fix for code style checks"

Browse Source 
CURA-5456

This reverts commit cc11e0a2425f0f5a6cb71005cdee1c92cd6736c2.
This commit is contained in:
Lipu Fei 2018-06-13 10:33:55 +02:00
parent abed6052d0
commit 880e098031
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Settings/SettingOverrideDecorator.py
View File

@ -95,7 +95,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
#
# \return An extruder's container stack.
def getActiveExtruder(self):
return None if self._extruder_stack is None else self._extruder_stack.getId()
return self._extruder_stack.getId()
## Gets the signal that emits if the active extruder changed.
#
@ -154,13 +154,10 @@ class SettingOverrideDecorator(SceneNodeDecorator):
#
# \param extruder_stack_id The new extruder stack to print with.
def setActiveExtruder(self, extruder_stack_id):
if self._extruder_stack is None or self._extruder_stack.getId() == extruder_stack_id:
if self._extruder_stack.getId() == extruder_stack_id:
return
global_stack = Application.getInstance().getMachineManager().activeMachine
if global_stack is None:
return
for extruder in global_stack.extruders.values():
if extruder.getId() == extruder_stack_id:
self._extruder_stack = extruder