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

Revert "global_profile" reference changes while refixing import

Browse source 
CURA-2518 and CURA-2478
This commit is contained in:
fieldOfView 2016-10-04 16:41:28 +02:00
parent 85d1fa8a39
commit 6d0da0d754
4 changed files with 17 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cura/Settings/ContainerManager.py
View file

@ -467,8 +467,6 @@ class ContainerManager(QObject):
base_name = active_quality_name
unique_name = self._container_registry.uniqueName(base_name)
global_changes = None
# Go through the active stacks and create quality_changes containers from the user containers.
for stack in cura.Settings.ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks():
user_container = stack.getTop()
@ -484,11 +482,6 @@ class ContainerManager(QObject):
extruder_id)
self._performMerge(new_changes, user_container)
if stack is global_stack:
global_changes = new_changes
else:
new_changes.setMetaDataEntry("global_profile", global_changes.getId())
self._container_registry.addContainer(new_changes)
stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_changes)
@ -570,16 +563,10 @@ class ContainerManager(QObject):
container_registry = self._container_registry
containers_to_rename = self._container_registry.findInstanceContainers(type = "quality_changes", name = quality_name)
containers_to_rename.extend(self._container_registry.findInstanceContainers(type = "quality_changes", global_profile = quality_name))
global_changes_id = ""
for container in containers_to_rename:
stack_id = container.getMetaDataEntry("extruder", global_stack.getId())
container_registry.renameContainer(container.getId(), new_name, self._createUniqueId(stack_id, new_name))
if "global_profile" not in container.getMetaData():
global_changes_id = container.getId()
else:
container.setMetaDataEntry("global_profile", global_changes_id)
if not containers_to_rename:
UM.Logger.log("e", "Unable to rename %s, because we could not find the profile", quality_name)
@ -649,10 +636,9 @@ class ContainerManager(QObject):
# Handle the extruders if present.
extruders = machine_definition.getMetaDataEntry("machine_extruder_trains")
if extruders:
for key in extruders:
value = extruders[key]
new_changes = self._createQualityChanges(quality_container, new_name, machine_definition, value)
new_changes.addMetaDataEntry("global_profile", global_changes.getId())
for extruder_id in extruders:
extruder = extruders[extruder_id]
new_changes = self._createQualityChanges(quality_container, new_name, machine_definition, extruder)
new_change_instances.append(new_changes)
self._container_registry.addContainer(new_changes)
@ -661,19 +647,12 @@ class ContainerManager(QObject):
# Duplicate a quality changes container
def _duplicateQualityChangesForMachineType(self, quality_changes_name, base_name, machine_definition):
new_change_instances = []
profile_index = -1
global_changes_id = ""
for container in QualityManager.getInstance().findQualityChangesByName(quality_changes_name,
machine_definition):
new_unique_id = self._createUniqueId(container.getId(), base_name)
new_container = container.duplicate(new_unique_id, base_name)
if profile_index >= 0:
new_container.setMetaDataEntry("global_profile", global_changes_id)
else:
global_changes_id = new_unique_id
new_change_instances.append(new_container)
self._container_registry.addContainer(new_container)
profile_index += 1
return new_change_instances