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

Fix creation of new materials

Browse Source 
CURA-6600
This commit is contained in:
Jaime van Kessel 2019-08-19 13:13:08 +02:00
parent 88857a7be8
commit fcbfa88d97
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cura/Machines/MaterialManager.py
View File

@ -283,14 +283,7 @@ class MaterialManager(QObject):
if root_material_id is not None: if root_material_id is not None:
self.removeMaterialByRootId(root_material_id) self.removeMaterialByRootId(root_material_id)
# def duplicateMaterialByRootId(self, root_material_id, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]:
# Creates a duplicate of a material, which has the same GUID and base_file metadata.
# Returns the root material ID of the duplicated material if successful.
#
@pyqtSlot("QVariant", result = str)
def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]:
root_material_id = cast(str, material_node.getMetaDataEntry("base_file", ""))
container_registry = CuraContainerRegistry.getInstance() container_registry = CuraContainerRegistry.getInstance()
results = container_registry.findContainers(id=root_material_id) results = container_registry.findContainers(id=root_material_id)
@ -317,7 +310,7 @@ class MaterialManager(QObject):
new_containers.append(new_base_container) new_containers.append(new_base_container)
# Clone all of them. # Clone all of them.
for container_to_copy in container_registry.findContainers(base_file= root_material_id): for container_to_copy in container_registry.findContainers(base_file=root_material_id):
if container_to_copy.getId() == root_material_id: if container_to_copy.getId() == root_material_id:
continue # We already have that one, skip it continue # We already have that one, skip it
new_id = new_base_id new_id = new_base_id
@ -344,8 +337,15 @@ class MaterialManager(QObject):
self.addFavorite(new_base_id) self.addFavorite(new_base_id)
return new_base_id return new_base_id
# #
# Creates a duplicate of a material, which has the same GUID and base_file metadata.
# Returns the root material ID of the duplicated material if successful.
#
@pyqtSlot("QVariant", result = str)
def duplicateMaterial(self, material_node: MaterialNode, new_base_id: Optional[str] = None, new_metadata: Dict[str, Any] = None) -> Optional[str]:
root_material_id = cast(str, material_node.getMetaDataEntry("base_file", ""))
return self.duplicateMaterialByRootId(root_material_id, new_base_id, new_metadata)
# Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID. # Create a new material by cloning Generic PLA for the current material diameter and generate a new GUID.
# Returns the ID of the newly created material. # Returns the ID of the newly created material.
@pyqtSlot(result = str) @pyqtSlot(result = str)
@ -364,11 +364,6 @@ class MaterialManager(QObject):
approximate_diameter = str(extruder_stack.approximateMaterialDiameter) approximate_diameter = str(extruder_stack.approximateMaterialDiameter)
root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_diameter) root_material_id = self.getRootMaterialIDForDiameter(root_material_id, approximate_diameter)
material_group = self.getMaterialGroup(root_material_id)
if not material_group: # This should never happen
Logger.log("w", "Cannot get the material group of %s.", root_material_id)
return ""
# Create a new ID & container to hold the data. # Create a new ID & container to hold the data.
new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material") new_id = CuraContainerRegistry.getInstance().uniqueName("custom_material")
@ -377,9 +372,7 @@ class MaterialManager(QObject):
"GUID": str(uuid.uuid4()), "GUID": str(uuid.uuid4()),
} }
self.duplicateMaterial(material_group.root_material_node, self.duplicateMaterialByRootId(root_material_id, new_base_id = new_id, new_metadata = new_metadata)
new_base_id = new_id,
new_metadata = new_metadata)
return new_id return new_id
@pyqtSlot(str) @pyqtSlot(str)