GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 05:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix creating a unique name for profiles

Browse Source 
CURA-1585
This commit is contained in:
fieldOfView 2016-06-06 15:55:14 +02:00
parent a2db4740b9
commit 0b57728d9d
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cura/MachineManagerModel.py
View File

@ -9,7 +9,8 @@ from UM.Logger import Logger
import UM.Settings import UM.Settings
from UM.Settings.Validator import ValidatorState from UM.Settings.Validator import ValidatorState
from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.InstanceContainer import InstanceContainer
from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura")
class MachineManagerModel(QObject): class MachineManagerModel(QObject):
def __init__(self, parent = None): def __init__(self, parent = None):
@ -118,7 +119,7 @@ class MachineManagerModel(QObject):
definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=definition_id) definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=definition_id)
if definitions: if definitions:
definition = definitions[0] definition = definitions[0]
name = self._createUniqueStackName(name, definition.getName()) name = self._createUniqueName("machine", name, definition.getName())
new_global_stack = UM.Settings.ContainerStack(name) new_global_stack = UM.Settings.ContainerStack(name)
new_global_stack.addMetaDataEntry("type", "machine") new_global_stack.addMetaDataEntry("type", "machine")
@ -168,7 +169,7 @@ class MachineManagerModel(QObject):
Application.getInstance().setGlobalContainerStack(new_global_stack) Application.getInstance().setGlobalContainerStack(new_global_stack)
# Create a name that is not empty and unique # Create a name that is not empty and unique
def _createUniqueStackName(self, name, fallback_name): def _createUniqueName(self, object_type, name, fallback_name):
name = name.strip() name = name.strip()
num_check = re.compile("(.*?)\s*#\d$").match(name) num_check = re.compile("(.*?)\s*#\d$").match(name)
if(num_check): if(num_check):
@ -179,10 +180,16 @@ class MachineManagerModel(QObject):
i = 1 i = 1
# Check both the id and the name, because they may not be the same and it is better if they are both unique # Check both the id and the name, because they may not be the same and it is better if they are both unique
while UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = unique_name, type = "machine") or \ if object_type == "machine":
UM.Settings.ContainerRegistry.getInstance().findContainerStacks(name = unique_name, type = "machine"): while UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = unique_name, type = "machine") or \
i += 1 UM.Settings.ContainerRegistry.getInstance().findContainerStacks(name = unique_name, type = "machine"):
unique_name = "%s #%d" % (name, i) i += 1
unique_name = "%s #%d" % (name, i)
else:
while UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = unique_name, type = object_type) or \
UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(name = unique_name, type = object_type):
i += 1
unique_name = "%s #%d" % (name, i)
return unique_name return unique_name
@ -282,7 +289,7 @@ class MachineManagerModel(QObject):
if not self._global_container_stack: if not self._global_container_stack:
return return
name = self._createUniqueStackName("Custom profile", "") name = self._createUniqueName("quality", self.activeQualityName, catalog.i18nc("@label", "Custom profile"))
user_settings = self._global_container_stack.getTop() user_settings = self._global_container_stack.getTop()
new_quality_container = InstanceContainer("") new_quality_container = InstanceContainer("")
@ -311,7 +318,7 @@ class MachineManagerModel(QObject):
return return
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=container_id) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id=container_id)
if containers: if containers:
new_name = self._createUniqueStackName(containers[0].getName(), "") new_name = self._createUniqueName("quality", containers[0].getName(), catalog.i18nc("@label", "Custom profile"))
new_container = InstanceContainer("") new_container = InstanceContainer("")
@ -424,7 +431,7 @@ class MachineManagerModel(QObject):
def renameMachine(self, machine_id, new_name): def renameMachine(self, machine_id, new_name):
containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = machine_id) containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks(id = machine_id)
if containers: if containers:
new_name = self._createUniqueStackName(new_name, containers[0].getBottom().getName()) new_name = self._createUniqueName("machine", new_name, containers[0].getBottom().getName())
containers[0].setName(new_name) containers[0].setName(new_name)
self.globalContainerChanged.emit() self.globalContainerChanged.emit()