mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-09 07:56:22 -06:00
Fix removeMaterials() and optimization
CURA-6886
This commit is contained in:
parent
9963c81294
commit
36aab5d56b
1 changed files with 25 additions and 10 deletions
|
@ -8,6 +8,7 @@ import uuid # To generate new GUIDs for new materials.
|
||||||
|
|
||||||
from UM.i18n import i18nCatalog
|
from UM.i18n import i18nCatalog
|
||||||
from UM.Logger import Logger
|
from UM.Logger import Logger
|
||||||
|
from UM.Signal import postponeSignals, CompressTechnique
|
||||||
|
|
||||||
import cura.CuraApplication # Imported like this to prevent circular imports.
|
import cura.CuraApplication # Imported like this to prevent circular imports.
|
||||||
from cura.Machines.ContainerTree import ContainerTree
|
from cura.Machines.ContainerTree import ContainerTree
|
||||||
|
@ -73,8 +74,20 @@ class MaterialManagementModel(QObject):
|
||||||
def removeMaterial(self, material_node: "MaterialNode") -> None:
|
def removeMaterial(self, material_node: "MaterialNode") -> None:
|
||||||
container_registry = CuraContainerRegistry.getInstance()
|
container_registry = CuraContainerRegistry.getInstance()
|
||||||
materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file)
|
materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file)
|
||||||
for material_metadata in materials_this_base_file:
|
|
||||||
container_registry.removeContainer(material_metadata["id"])
|
# The material containers belonging to the same material file are supposed to work together. This postponeSignals()
|
||||||
|
# does two things:
|
||||||
|
# - optimizing the signal emitting.
|
||||||
|
# - making sure that the signals will only be emitted after all the material containers have been removed.
|
||||||
|
with postponeSignals(container_registry.containerRemoved, compress = CompressTechnique.CompressPerParameterValue):
|
||||||
|
# CURA-6886: Some containers may not have been loaded. If remove one material container, its material file
|
||||||
|
# will be removed. If later we remove a sub-material container which hasn't been loaded previously, it will
|
||||||
|
# crash because removeContainer() requires to load the container first, but the material file was already
|
||||||
|
# gone.
|
||||||
|
for material_metadata in materials_this_base_file:
|
||||||
|
container_registry.findInstanceContainers(id = material_metadata["id"])
|
||||||
|
for material_metadata in materials_this_base_file:
|
||||||
|
container_registry.removeContainer(material_metadata["id"])
|
||||||
|
|
||||||
## Creates a duplicate of a material with the same GUID and base_file
|
## Creates a duplicate of a material with the same GUID and base_file
|
||||||
# metadata.
|
# metadata.
|
||||||
|
@ -128,15 +141,17 @@ class MaterialManagementModel(QObject):
|
||||||
new_container.getMetaData().update(new_metadata)
|
new_container.getMetaData().update(new_metadata)
|
||||||
new_containers.append(new_container)
|
new_containers.append(new_container)
|
||||||
|
|
||||||
for container_to_add in new_containers:
|
# Optimization. Serving the same purpose as the postponeSignals() in removeMaterial()
|
||||||
container_to_add.setDirty(True)
|
with postponeSignals(container_registry.containerAdded, compress=CompressTechnique.CompressPerParameterValue):
|
||||||
container_registry.addContainer(container_to_add)
|
for container_to_add in new_containers:
|
||||||
|
container_to_add.setDirty(True)
|
||||||
|
container_registry.addContainer(container_to_add)
|
||||||
|
|
||||||
# If the duplicated material was favorite then the new material should also be added to the favorites.
|
# If the duplicated material was favorite then the new material should also be added to the favorites.
|
||||||
favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";"))
|
favorites_set = set(application.getPreferences().getValue("cura/favorite_materials").split(";"))
|
||||||
if base_file in favorites_set:
|
if base_file in favorites_set:
|
||||||
favorites_set.add(new_base_id)
|
favorites_set.add(new_base_id)
|
||||||
application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set))
|
application.getPreferences().setValue("cura/favorite_materials", ";".join(favorites_set))
|
||||||
|
|
||||||
return new_base_id
|
return new_base_id
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue