3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -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

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

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