From 6d2492e5cbe62d593b5a31cf23aea20a59ad926b Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 12 Sep 2018 12:59:13 +0200 Subject: [PATCH] Remove spurious signal, it does the same as materialsUpdated. Contributes to CURA-5682. --- cura/Machines/MaterialManager.py | 15 ++++----------- cura/Machines/Models/BaseMaterialsModel.py | 3 --- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py index 96572354b5..7075eaa004 100644 --- a/cura/Machines/MaterialManager.py +++ b/cura/Machines/MaterialManager.py @@ -40,7 +40,6 @@ if TYPE_CHECKING: class MaterialManager(QObject): materialsUpdated = pyqtSignal() # Emitted whenever the material lookup tables are updated. - favoritesUpdated = pyqtSignal() # Emitted whenever the favorites are changed def __init__(self, container_registry, parent = None): super().__init__(parent) @@ -196,17 +195,11 @@ class MaterialManager(QObject): for material_metadata in material_metadatas.values(): self.__addMaterialMetadataIntoLookupTree(material_metadata) - self.materialsUpdated.emit() - favorites = self._application.getPreferences().getValue("cura/favorite_materials") - favorite_added = False for item in favorites.split(";"): - if item not in self._favorites: - self._favorites.add(item) - favorite_added = True + self._favorites.add(item) - if favorite_added: - self.favoritesUpdated.emit() + self.materialsUpdated.emit() def __addMaterialMetadataIntoLookupTree(self, material_metadata: dict) -> None: material_id = material_metadata["id"] @@ -626,7 +619,7 @@ class MaterialManager(QObject): @pyqtSlot(str) def addFavorite(self, root_material_id: str): self._favorites.add(root_material_id) - self.favoritesUpdated.emit() + self.materialsUpdated.emit() # Ensure all settings are saved. self._application.getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) @@ -635,7 +628,7 @@ class MaterialManager(QObject): @pyqtSlot(str) def removeFavorite(self, root_material_id: str): self._favorites.remove(root_material_id) - self.favoritesUpdated.emit() + self.materialsUpdated.emit() # Ensure all settings are saved. self._application.getPreferences().setValue("cura/favorite_materials", ";".join(list(self._favorites))) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 1b20e1188c..c08013566b 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -34,9 +34,6 @@ class BaseMaterialsModel(ListModel): # Update this model when list of materials changes self._material_manager.materialsUpdated.connect(self._update) - # Update this model when list of favorites changes - self._material_manager.favoritesUpdated.connect(self._update) - self.addRoleName(Qt.UserRole + 1, "root_material_id") self.addRoleName(Qt.UserRole + 2, "id") self.addRoleName(Qt.UserRole + 3, "GUID")