diff options
author | Simon Edwards <s.edwards@ultimaker.com> | 2016-12-12 18:05:35 +0300 |
---|---|---|
committer | Simon Edwards <s.edwards@ultimaker.com> | 2016-12-12 18:05:35 +0300 |
commit | 74e5798509b274908fc98b704fdc7848c6ab4e27 (patch) | |
tree | 8e31c1e4cc408496ba4894915b0a12f5cb14e3fd /cura/ConvexHullDecorator.py | |
parent | 5884509af1f785d6c48b0af294ae9a989ecb2155 (diff) |
Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
Diffstat (limited to 'cura/ConvexHullDecorator.py')
-rw-r--r-- | cura/ConvexHullDecorator.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index c4b2fe0337..65c799619a 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -1,13 +1,13 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from UM.Scene.SceneNodeDecorator import SceneNodeDecorator from UM.Application import Application -from cura.Settings.ExtruderManager import ExtruderManager from UM.Math.Polygon import Polygon -from . import ConvexHullNode +from UM.Scene.SceneNodeDecorator import SceneNodeDecorator +from UM.Settings.ContainerRegistry import ContainerRegistry -import UM.Settings.ContainerRegistry +from cura.Settings.ExtruderManager import ExtruderManager +from . import ConvexHullNode import numpy @@ -308,11 +308,11 @@ class ConvexHullDecorator(SceneNodeDecorator): extruder_stack_id = self._node.callDecoration("getActiveExtruder") if not extruder_stack_id: #Decoration doesn't exist. extruder_stack_id = ExtruderManager.getInstance().extruderIds["0"] - extruder_stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] + extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] return extruder_stack.getProperty(setting_key, property) else: #Limit_to_extruder is set. Use that one. extruder_stack_id = ExtruderManager.getInstance().extruderIds[str(extruder_index)] - stack = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] + stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] return stack.getProperty(setting_key, property) ## Returns true if node is a descendant or the same as the root node. |