3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve models

Browse source 
Contributes to CURA-5162, CURA-5378
This commit is contained in:
Ian Paschal 2018-08-22 12:33:29 +02:00
parent 08b325ee04
commit cb713eea6a
4 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -23,6 +23,7 @@ class BaseMaterialsModel(ListModel):
ContainerNodeRole = Qt.UserRole + 7 ContainerNodeRole = Qt.UserRole + 7
ColorCodeRole = Qt.UserRole + 8 ColorCodeRole = Qt.UserRole + 8
GUIDRole = Qt.UserRole + 9 GUIDRole = Qt.UserRole + 9
IsFavoriteRole = Qt.UserRole + 10
extruderPositionChanged = pyqtSignal() extruderPositionChanged = pyqtSignal()
@ -40,6 +41,7 @@ class BaseMaterialsModel(ListModel):
self.addRoleName(self.ColorRole, "color_name") self.addRoleName(self.ColorRole, "color_name")
self.addRoleName(self.ColorCodeRole, "color_code") self.addRoleName(self.ColorCodeRole, "color_code")
self.addRoleName(self.ContainerNodeRole, "container_node") self.addRoleName(self.ContainerNodeRole, "container_node")
self.addRoleName(self.IsFavoriteRole, "is_favorite")
self._extruder_position = 0 self._extruder_position = 0
self._extruder_stack = None self._extruder_stack = None

4
cura/Machines/Models/BrandMaterialsModel.py
View file

@ -58,6 +58,7 @@ class BrandMaterialsModel(ListModel):
self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack) self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack)
self._machine_manager.activeStackChanged.connect(self._update) #Update when switching machines. self._machine_manager.activeStackChanged.connect(self._update) #Update when switching machines.
self._material_manager.materialsUpdated.connect(self._update) #Update when the list of materials changes. self._material_manager.materialsUpdated.connect(self._update) #Update when the list of materials changes.
# self._material_manager.favoritesUpdated.connect(self._update) # Update when favorites are changed
self._update() self._update()
def _updateExtruderStack(self): def _updateExtruderStack(self):
@ -106,6 +107,7 @@ class BrandMaterialsModel(ListModel):
for root_material_id, container_node in available_material_dict.items(): for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata metadata = container_node.metadata
favorites = self._material_manager.getFavorites()
# Do not include the materials from a to-be-removed package # Do not include the materials from a to-be-removed package
if bool(metadata.get("removed", False)): if bool(metadata.get("removed", False)):
@ -142,7 +144,7 @@ class BrandMaterialsModel(ListModel):
"adhesion_info": metadata["adhesion_info"], "adhesion_info": metadata["adhesion_info"],
"is_read_only": self._container_registry.isReadOnly(metadata["id"]), "is_read_only": self._container_registry.isReadOnly(metadata["id"]),
"container_node": container_node, "container_node": container_node,
"is_favorite": False "is_favorite": root_material_id in favorites
} }
brand_group_dict[brand][material_type].append(item) brand_group_dict[brand][material_type].append(item)

9
cura/Machines/Models/FavoriteMaterialsModel.py
View file

@ -27,6 +27,7 @@ class FavoriteMaterialsModel(BaseMaterialsModel):
if global_stack is None: if global_stack is None:
self.setItems([]) self.setItems([])
return return
extruder_position = str(self._extruder_position) extruder_position = str(self._extruder_position)
if extruder_position not in global_stack.extruders: if extruder_position not in global_stack.extruders:
self.setItems([]) self.setItems([])
@ -40,8 +41,6 @@ class FavoriteMaterialsModel(BaseMaterialsModel):
favorite_ids = self._material_manager.getFavorites() favorite_ids = self._material_manager.getFavorites()
print("favorite_ids:", favorite_ids)
item_list = [] item_list = []
for root_material_id, container_node in available_material_dict.items(): for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata metadata = container_node.metadata
@ -61,11 +60,13 @@ class FavoriteMaterialsModel(BaseMaterialsModel):
"brand": metadata["brand"], "brand": metadata["brand"],
"material": metadata["material"], "material": metadata["material"],
"color_name": metadata["color_name"], "color_name": metadata["color_name"],
"container_node": container_node "color_code": metadata["color_code"],
"container_node": container_node,
"is_favorite": True
} }
item_list.append(item) item_list.append(item)
# Sort the item list by material name alphabetically # Sort the item list by material name alphabetically
item_list = sorted(item_list, key = lambda d: d["name"].upper()) item_list = sorted(item_list, key = lambda d: d["brand"].upper())
self.setItems(item_list) self.setItems(item_list)

21
cura/Machines/Models/GenericMaterialsModel.py
View file

@ -38,6 +38,8 @@ class GenericMaterialsModel(BaseMaterialsModel):
self.setItems([]) self.setItems([])
return return
favorites = self._material_manager.getFavorites()
item_list = [] item_list = []
for root_material_id, container_node in available_material_dict.items(): for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata metadata = container_node.metadata
@ -50,14 +52,17 @@ class GenericMaterialsModel(BaseMaterialsModel):
if bool(metadata.get("removed", False)): if bool(metadata.get("removed", False)):
continue continue
item = {"root_material_id": root_material_id, item = {
"id": metadata["id"], "root_material_id": root_material_id,
"name": metadata["name"], "id": metadata["id"],
"brand": metadata["brand"], "name": metadata["name"],
"material": metadata["material"], "brand": metadata["brand"],
"color_name": metadata["color_name"], "material": metadata["material"],
"container_node": container_node "color_name": metadata["color_name"],
} "color_code": metadata["color_code"],
"container_node": container_node,
"is_favorite": root_material_id in favorites
}
item_list.append(item) item_list.append(item)
# Sort the item list by material name alphabetically # Sort the item list by material name alphabetically