From 5c354eb6a36b77fb3fcb850fd8439a62f93f436f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 26 Feb 2019 10:45:18 +0100 Subject: [PATCH] Switch the order of name & id in addMachine call This makes it possible for the name to not be set, in which case it will default to the name provided by the definition CURA-6179 --- cura/Settings/MachineManager.py | 8 +++++++- resources/qml/Dialogs/AddMachineDialog.qml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3416f0a321..a96a2c9443 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -386,8 +386,14 @@ class MachineManager(QObject): return machine return None + @pyqtSlot(str) @pyqtSlot(str, str) - def addMachine(self, name: str, definition_id: str) -> None: + def addMachine(self, definition_id: str, name: Optional[str] = None) -> None: + if name is None: + definitions = CuraContainerRegistry.getInstance().findDefinitionContainers(id = definition_id) + if definitions: + name = definitions[0].getName() + new_stack = CuraStackBuilder.createMachine(name, definition_id) if new_stack: # Instead of setting the global container stack here, we set the active machine and so the signals are emitted diff --git a/resources/qml/Dialogs/AddMachineDialog.qml b/resources/qml/Dialogs/AddMachineDialog.qml index f00359869c..dafe12693f 100644 --- a/resources/qml/Dialogs/AddMachineDialog.qml +++ b/resources/qml/Dialogs/AddMachineDialog.qml @@ -303,7 +303,7 @@ UM.Dialog { base.visible = false var item = machineList.model.getItem(machineList.currentIndex); - Cura.MachineManager.addMachine(machineName.text, item.id) + Cura.MachineManager.addMachine(item.id, machineName.text) base.machineAdded(item.id) // Emit signal that the user added a machine. }