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

Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44

Browse Source 
Cura 6917 unlink duplicated material
This commit is contained in:
Remco Burema 2019-11-07 17:23:28 +01:00 committed by GitHub
commit 00f505374b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Settings/ContainerManager.py
View File

@ -339,11 +339,11 @@ class ContainerManager(QObject):
# \return A list of names of materials with the same GUID.
@pyqtSlot("QVariant", bool, result = "QStringList")
def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]:
same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(guid = material_node.guid)
same_guid = ContainerRegistry.getInstance().findInstanceContainersMetadata(GUID = material_node.guid)
if exclude_self:
return [metadata["name"] for metadata in same_guid if metadata["base_file"] != material_node.base_file]
return list({meta["name"] for meta in same_guid if meta["base_file"] != material_node.base_file})
else:
return [metadata["name"] for metadata in same_guid]
return list({meta["name"] for meta in same_guid})
## Unlink a material from all other materials by creating a new GUID
# \param material_id \type{str} the id of the material to create a new GUID for.

2
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -46,7 +46,7 @@ TabView
{
return ""
}
return linkedMaterials.join(", ");
return linkedMaterials;
}
function getApproximateDiameter(diameter)