From 3082038261c113d5b45f9ec7fc4b3fb305427ef3 Mon Sep 17 00:00:00 2001 From: "A.Sasin" Date: Fri, 29 Sep 2017 13:52:00 +0200 Subject: [PATCH] Fixed code style and machine default name is retrieved from machine definition CURA-4345 --- cura/Settings/CuraStackBuilder.py | 6 +++--- cura/Settings/MachineManager.py | 6 +++--- resources/qml/AddMachineDialog.qml | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 32d6cd3cd7..7a48b1657e 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -21,7 +21,7 @@ class CuraStackBuilder: # # \return The new global stack or None if an error occurred. @classmethod - def createMachine(cls, name: str, definition_id: str, default_name: str) -> Optional[GlobalStack]: + def createMachine(cls, name: str, definition_id: str) -> Optional[GlobalStack]: registry = ContainerRegistry.getInstance() definitions = registry.findDefinitionContainers(id = definition_id) if not definitions: @@ -29,7 +29,7 @@ class CuraStackBuilder: return None machine_definition = definitions[0] - generated_name = registry.createUniqueName("machine", "", default_name, machine_definition.name) + generated_name = registry.createUniqueName("machine", "", machine_definition.name, machine_definition.name) # Make sure the new name does not collide with any definition or (quality) profile # createUniqueName() only looks at other stacks, but not at definitions or quality profiles # Note that we don't go for uniqueName() immediately because that function matches with ignore_case set to true @@ -45,7 +45,7 @@ class CuraStackBuilder: ) # after creating a global stack can be set custom defined name - if(name != generated_name): + if name != generated_name: name = registry.createUniqueName("machine", "", name, machine_definition.name) if registry.findContainers(id = name): name = registry.uniqueName(name) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ce9cdc7de7..4a321d0529 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -352,9 +352,9 @@ class MachineManager(QObject): if containers: Application.getInstance().setGlobalContainerStack(containers[0]) - @pyqtSlot(str, str, str) - def addMachine(self, name: str, definition_id: str, default_name: str) -> None: - new_stack = CuraStackBuilder.createMachine(name, definition_id, default_name) + @pyqtSlot(str, str) + def addMachine(self, name: str, definition_id: str) -> None: + new_stack = CuraStackBuilder.createMachine(name, definition_id) if new_stack: Application.getInstance().setGlobalContainerStack(new_stack) else: diff --git a/resources/qml/AddMachineDialog.qml b/resources/qml/AddMachineDialog.qml index 2a3e279bcc..109ea07695 100644 --- a/resources/qml/AddMachineDialog.qml +++ b/resources/qml/AddMachineDialog.qml @@ -217,8 +217,7 @@ UM.Dialog { base.visible = false var item = machineList.model.getItem(machineList.currentIndex); - var defaultName = (item != undefined) ? item.name : "" - Cura.MachineManager.addMachine(machineName.text, item.id, defaultName) + Cura.MachineManager.addMachine(machineName.text, item.id) base.machineAdded(item.id) // Emit signal that the user added a machine. }