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

Merge branch '2.3'

Browse Source 
* 2.3:
  Use the machine/extruder ID as base for duplicated profile ID
  Fix "critical" error when starting with no active machine
This commit is contained in:
Arjen Hiemstra 2016-10-24 13:40:57 +02:00
commit 3d63df7471
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Settings/ContainerManager.py
View File

@ -650,7 +650,10 @@ class ContainerManager(QObject):
new_change_instances = [] new_change_instances = []
for container in QualityManager.getInstance().findQualityChangesByName(quality_changes_name, for container in QualityManager.getInstance().findQualityChangesByName(quality_changes_name,
machine_definition): machine_definition):
new_unique_id = self._createUniqueId(container.getId(), base_name) base_id = container.getMetaDataEntry("extruder")
if not base_id:
base_id = container.getDefinition().getId()
new_unique_id = self._createUniqueId(base_id, base_name)
new_container = container.duplicate(new_unique_id, base_name) new_container = container.duplicate(new_unique_id, base_name)
new_change_instances.append(new_container) new_change_instances.append(new_container)
self._container_registry.addContainer(new_container) self._container_registry.addContainer(new_container)
@ -788,6 +791,7 @@ class ContainerManager(QObject):
# Create a new quality_changes container for the quality. # Create a new quality_changes container for the quality.
quality_changes = UM.Settings.InstanceContainer(self._createUniqueId(base_id, new_name)) quality_changes = UM.Settings.InstanceContainer(self._createUniqueId(base_id, new_name))
print(quality_changes.getId())
quality_changes.setName(new_name) quality_changes.setName(new_name)
quality_changes.addMetaDataEntry("type", "quality_changes") quality_changes.addMetaDataEntry("type", "quality_changes")
quality_changes.addMetaDataEntry("quality_type", quality_container.getMetaDataEntry("quality_type")) quality_changes.addMetaDataEntry("quality_type", quality_container.getMetaDataEntry("quality_type"))