From 19d334f35c7232e87f77e7de55126959bf5753d8 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Nov 2019 14:31:38 +0100 Subject: [PATCH 1/4] Fix typing imports. --- cura/Machines/Models/IntentTranslations.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index fd6a2db9ee..f78e8df128 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -1,5 +1,6 @@ import collections from UM.i18n import i18nCatalog +from typing import Dict, Optional catalog = i18nCatalog("cura") intent_translations = collections.OrderedDict() # type: "collections.OrderedDict[str, Dict[str, Optional[str]]]" From 0b450ef9f468899c8b36d18e02d8edcc67879757 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 7 Nov 2019 15:28:09 +0100 Subject: [PATCH 2/4] Fix linked materials not being found due to key casing CURA-6917 --- cura/Settings/ContainerManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 4a4a7b64dd..f2917ca21f 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -339,7 +339,7 @@ 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] else: From 6e79f489e2087c32c84d82390ad514340165ff96 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 7 Nov 2019 15:28:53 +0100 Subject: [PATCH 3/4] When multiple linked materials are found, only display the first CURA-6917 --- resources/qml/Preferences/Materials/MaterialsView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index f781497081..8ada441f1e 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -46,7 +46,7 @@ TabView { return "" } - return linkedMaterials.join(", "); + return linkedMaterials[0]; } function getApproximateDiameter(diameter) From 3636eed96441e3c7e57bb1c519b7efb8e4c1bc37 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Nov 2019 17:19:18 +0100 Subject: [PATCH 4/4] Instead of selecting first, return only uniques. part of CURA-6917 --- cura/Settings/ContainerManager.py | 4 ++-- resources/qml/Preferences/Materials/MaterialsView.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index f2917ca21f..ff129d35e2 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -341,9 +341,9 @@ class ContainerManager(QObject): def getLinkedMaterials(self, material_node: "MaterialNode", exclude_self: bool = False) -> List[str]: 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. diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 8ada441f1e..57253b9dff 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -46,7 +46,7 @@ TabView { return "" } - return linkedMaterials[0]; + return linkedMaterials; } function getApproximateDiameter(diameter)