3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

During adding a new printer the printer name generated from default name and not from custom name (changed by user)

Browse source 
CURA-4345
This commit is contained in:
alekseisasin 2017-09-28 13:22:15 +02:00
parent 2dee054003
commit 5402092bb4
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cura/Settings/CuraStackBuilder.py
View file

@ -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) -> Optional[GlobalStack]:
def createMachine(cls, name: str, definition_id: str, default_name: str) -> Optional[GlobalStack]:
registry = ContainerRegistry.getInstance()
definitions = registry.findDefinitionContainers(id = definition_id)
if not definitions:
@ -29,21 +29,29 @@ class CuraStackBuilder:
return None
machine_definition = definitions[0]
name = registry.createUniqueName("machine", "", name, machine_definition.name)
generated_name = registry.createUniqueName("machine", "", default_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
if registry.findContainers(id = name):
name = registry.uniqueName(name)
if registry.findContainers(id = generated_name):
generated_name = registry.uniqueName(generated_name)
new_global_stack = cls.createGlobalStack(
new_stack_id = name,
new_stack_id = generated_name,
definition = machine_definition,
quality = "default",
material = "default",
variant = "default",
)
# after creating a global stack can be set custom defined name
if(name != generated_name):
name = registry.createUniqueName("machine", "", name, machine_definition.name)
if registry.findContainers(id = name):
name = registry.uniqueName(name)
new_global_stack.setName(name)
for extruder_definition in registry.findDefinitionContainers(machine = machine_definition.id):
position = extruder_definition.getMetaDataEntry("position", None)
if not position: