diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index d222e37bd9..a70683bd21 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -13,7 +13,7 @@ from UM.Resources import Resources from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then. from UM.Platform import Platform -from cura.Settings.ExtruderManager import ExtruderManager +import cura.Settings from cura.OneAtATimeIterator import OneAtATimeIterator from . import ProcessSlicedLayersJob @@ -63,7 +63,7 @@ class CuraEngineBackend(Backend): self._onGlobalStackChanged() self._active_extruder_stack = None - ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) + cura.Settings.ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) self._onActiveExtruderChanged() #When you update a setting and other settings get changed through inheritance, many propertyChanged signals are fired. @@ -379,8 +379,8 @@ class CuraEngineBackend(Backend): self._active_extruder_stack.propertyChanged.disconnect(self._onSettingChanged) self._active_extruder_stack.containersChanged.disconnect(self._onChanged) - self._active_extruder_stack = ExtruderManager.getInstance().getActiveExtruderStack() + self._active_extruder_stack = cura.Settings.ExtruderManager.getInstance().getActiveExtruderStack() if self._active_extruder_stack: self._active_extruder_stack.propertyChanged.connect(self._onSettingChanged) # Note: Only starts slicing when the value changed. self._active_extruder_stack.containersChanged.connect(self._onChanged) - self._onChanged() \ No newline at end of file + self._onChanged() diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 6ed103d0b5..cdfcecb6b9 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -15,7 +15,8 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Settings.Validator import ValidatorState from cura.OneAtATimeIterator import OneAtATimeIterator -from cura.Settings.ExtruderManager import ExtruderManager + +import cura.Settings class StartJobResult(IntEnum): Finished = 1 @@ -128,7 +129,7 @@ class StartSliceJob(Job): self._buildGlobalSettingsMessage(stack) - for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getBottom().getId()): + for extruder_stack in cura.Settings.ExtruderManager.getInstance().getMachineExtruders(stack.getBottom().getId()): self._buildExtruderMessage(extruder_stack) for group in object_groups: @@ -208,4 +209,4 @@ class StartSliceJob(Job): setting = message.addRepeatedMessage("settings") setting.name = key setting.value = str(stack.getProperty(key, "value")).encode("utf-8") - Job.yieldThread() \ No newline at end of file + Job.yieldThread() diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 2af4108f23..15cf25e65e 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -10,7 +10,7 @@ from UM.View.Renderer import Renderer from UM.View.GL.OpenGL import OpenGL -from cura.Settings.ExtrudersModel import ExtrudersModel +import cura.Settings import math @@ -24,7 +24,7 @@ class SolidView(View): self._enabled_shader = None self._disabled_shader = None - self._extruders_model = ExtrudersModel() + self._extruders_model = cura.Settings.ExtrudersModel() def beginRendering(self): scene = self.getController().getScene()