diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 1556ee8d22..4ee86e2ef0 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -55,12 +55,12 @@ class BuildVolume(SceneNode): if not self._material: self._material = renderer.createMaterial( - Resources.getPath(Resources.ShadersLocation, "basic.vert"), - Resources.getPath(Resources.ShadersLocation, "vertexcolor.frag") + Resources.getPath(Resources.Shaders, "basic.vert"), + Resources.getPath(Resources.Shaders, "vertexcolor.frag") ) self._grid_material = renderer.createMaterial( - Resources.getPath(Resources.ShadersLocation, "basic.vert"), - Resources.getPath(Resources.ShadersLocation, "grid.frag") + Resources.getPath(Resources.Shaders, "basic.vert"), + Resources.getPath(Resources.Shaders, "grid.frag") ) self._grid_material.setUniformValue("u_gridColor0", Color(245, 245, 245, 255)) self._grid_material.setUniformValue("u_gridColor1", Color(205, 202, 201, 255)) @@ -135,7 +135,7 @@ class BuildVolume(SceneNode): self._aabb = AxisAlignedBox(minimum = Vector(minW, minH - 1.0, minD), maximum = Vector(maxW, maxH, maxD)) - settings = Application.getInstance().getActiveMachine() + settings = Application.getInstance().getMachineManager().getActiveMachineInstance() skirt_size = 0.0 if settings.getSettingValueByKey("adhesion_type") == "None": diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index c2a6913404..9edb111c77 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -14,7 +14,7 @@ class ConvexHullDecorator(SceneNodeDecorator): self._convex_hull_node = None self._convex_hull_job = None - settings = Application.getInstance().getActiveMachine() + settings = Application.getInstance().getMachineManager().getActiveMachineInstance() print_sequence_setting = settings.getSettingByKey("print_sequence") if print_sequence_setting: print_sequence_setting.valueChanged.connect(self._onPrintSequenceSettingChanged) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index ed0386413e..b6ecd34a63 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -162,17 +162,20 @@ class CuraApplication(QtApplication): self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml")) self.initializeEngine() - #if self.getMachines(): - #active_machine_pref = Preferences.getInstance().getValue("cura/active_machine") - #if active_machine_pref: - #for machine in self.getMachines(): - #if machine.getName() == active_machine_pref: - #self.setActiveMachine(machine) + manager = self.getMachineManager() + if manager.getMachineInstances(): + active_machine_pref = Preferences.getInstance().getValue("cura/active_machine") + if active_machine_pref: + index = manager.findMachineInstance(active_machine_pref) + if index != -1: + manager.setActiveMachineInstance(manager.getMachineInstance(index)) - #if not self.getActiveMachine(): - #self.setActiveMachine(self.getMachines()[0]) - #else: - #self.requestAddPrinter.emit() + if not manager.getActiveMachineInstance(): + manager.setActiveMachineInstance(manager.getMachineInstance(index)) + else: + self.requestAddPrinter.emit() + + manager.setActiveProfile(manager.getProfiles()[0]) if self._engine.rootObjects: self.closeSplash() @@ -462,7 +465,7 @@ class CuraApplication(QtApplication): Selection.remove(node) def _onActiveMachineChanged(self): - machine = self.getActiveMachine() + machine = self.getMachineManager().getActiveMachineInstance() if machine: Preferences.getInstance().setValue("cura/active_machine", machine.getName()) diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py index 1caf504ad1..b43ff0a5d3 100644 --- a/plugins/LayerView/LayerView.py +++ b/plugins/LayerView/LayerView.py @@ -52,10 +52,10 @@ class LayerView(View): renderer.setRenderSelection(False) if not self._material: - self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "vertexcolor.frag")) + self._material = renderer.createMaterial(Resources.getPath(Resources.Shaders, "basic.vert"), Resources.getPath(Resources.Shaders, "vertexcolor.frag")) self._material.setUniformValue("u_color", [1.0, 0.0, 0.0, 1.0]) - self._selection_material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag")) + self._selection_material = renderer.createMaterial(Resources.getPath(Resources.Shaders, "basic.vert"), Resources.getPath(Resources.Shaders, "color.frag")) self._selection_material.setUniformValue("u_color", Color(35, 35, 35, 128)) for node in DepthFirstIterator(scene.getRoot()): diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 22eb376066..e5a2219c8f 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -119,13 +119,13 @@ UM.MainWindow { title: qsTr("&Machine"); Instantiator { - model: UM.Models.machinesModel + model: UM.MachineInstancesModel { } MenuItem { text: model.name; checkable: true; checked: model.active; exclusiveGroup: machineMenuGroup; - onTriggered: UM.Models.machinesModel.setActive(index) + onTriggered: UM.MachineManager.setActiveMachineInstance(model.name) } onObjectAdded: machineMenu.insertItem(index, object) onObjectRemoved: machineMenu.removeItem(object) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index efc6949668..980da31adc 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 -import UM 1.0 as UM +import UM 1.1 as UM Column { id: base; @@ -78,8 +78,7 @@ Column { ToolButton { id: machineButton; - text: UM.Application.machineName; - tooltip: UM.Application.machineName; + text: UM.MachineManager.activeMachineInstance; style: UM.Theme.styles.sidebar_header_button; @@ -88,13 +87,13 @@ Column { menu: Menu { id: machineMenu; Instantiator { - model: UM.Models.machinesModel + model: UM.MachineInstancesModel { } MenuItem { text: model.name; checkable: true; checked: model.active; exclusiveGroup: machineMenuGroup; - onTriggered: UM.Models.machinesModel.setActive(index) + onTriggered: UM.MachineManager.setActiveMachineInstance(model.name); } onObjectAdded: machineMenu.insertItem(index, object) onObjectRemoved: machineMenu.removeItem(object)