3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Fix for code style checks"

Browse source 
CURA-5456

This reverts commit cc11e0a242.
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
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. # \return An extruder's container stack.
def getActiveExtruder(self): 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. ## 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. # \param extruder_stack_id The new extruder stack to print with.
def setActiveExtruder(self, extruder_stack_id): 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 return
global_stack = Application.getInstance().getMachineManager().activeMachine global_stack = Application.getInstance().getMachineManager().activeMachine
if global_stack is None:
return
for extruder in global_stack.extruders.values(): for extruder in global_stack.extruders.values():
if extruder.getId() == extruder_stack_id: if extruder.getId() == extruder_stack_id:
self._extruder_stack = extruder self._extruder_stack = extruder