3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CURA-5456 Fix some code-style

Browse source
This commit is contained in:
Diego Prado Gesto 2018-06-12 11:21:36 +02:00
parent cc11e0a242
commit c5d48a3a9a
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cura/Settings/SettingOverrideDecorator.py
View file

@ -3,6 +3,7 @@
import copy import copy
import uuid import uuid
from typing import cast
from UM.Scene.SceneNodeDecorator import SceneNodeDecorator from UM.Scene.SceneNodeDecorator import SceneNodeDecorator
from UM.Signal import Signal, signalemitter from UM.Signal import Signal, signalemitter
@ -12,6 +13,7 @@ from UM.Logger import Logger
from UM.Util import parseBool from UM.Util import parseBool
from UM.Application import Application from UM.Application import Application
from cura.Settings.CuraContainerStack import CuraContainerStack
from cura.Settings.PerObjectContainerStack import PerObjectContainerStack from cura.Settings.PerObjectContainerStack import PerObjectContainerStack
from cura.Settings.ExtruderManager import ExtruderManager from cura.Settings.ExtruderManager import ExtruderManager
@ -62,6 +64,8 @@ class SettingOverrideDecorator(SceneNodeDecorator):
if not parseBool(self._extruder_stack.getMetaDataEntry("enabled", "True")): if not parseBool(self._extruder_stack.getMetaDataEntry("enabled", "True")):
# switch to the first extruder that's available # switch to the first extruder that's available
global_stack = Application.getInstance().getMachineManager().activeMachine global_stack = Application.getInstance().getMachineManager().activeMachine
if global_stack is None:
return
for _, extruder in sorted(list(global_stack.extruders.items())): for _, extruder in sorted(list(global_stack.extruders.items())):
if parseBool(extruder.getMetaDataEntry("enabled", "True")): if parseBool(extruder.getMetaDataEntry("enabled", "True")):
self._extruder_stack = extruder self._extruder_stack = extruder
@ -82,7 +86,10 @@ class SettingOverrideDecorator(SceneNodeDecorator):
deep_copy._stack.replaceContainer(0, instance_container) deep_copy._stack.replaceContainer(0, instance_container)
# Properly set the right extruder on the copy # Properly set the right extruder on the copy
deep_copy.setActiveExtruder(self._extruder_stack.getId()) if self._extruder_stack is None:
deep_copy._extruder_stack = None
else:
deep_copy.setActiveExtruder(self._extruder_stack.getId())
# use value from the stack because there can be a delay in signal triggering and "_is_non_printing_mesh" # use value from the stack because there can be a delay in signal triggering and "_is_non_printing_mesh"
# has not been updated yet. # has not been updated yet.
@ -148,12 +155,14 @@ class SettingOverrideDecorator(SceneNodeDecorator):
Application.getInstance().getBackend().needsSlicing() Application.getInstance().getBackend().needsSlicing()
Application.getInstance().getBackend().tickle() Application.getInstance().getBackend().tickle()
else: else:
self._stack.setNextStack(Application.getInstance().getGlobalContainerStack()) global_stack = Application.getInstance().getGlobalContainerStack()
if global_stack:
self._stack.setNextStack(cast(CuraContainerStack, global_stack))
## Changes the extruder with which to print this node. ## Changes the extruder with which to print this node.
# #
# \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: str) -> None:
if self._extruder_stack is None or self._extruder_stack.getId() == extruder_stack_id: if self._extruder_stack is None or self._extruder_stack.getId() == extruder_stack_id:
return return