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

Re-added material detail view

Browse source 
Contributes to CURA-5378
This commit is contained in:
Ian Paschal 2018-08-22 15:58:58 +02:00
parent 00eb8e6788
commit 6225fff1f8
8 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,24 +127,23 @@ class BrandMaterialsModel(ListModel):
# Now handle the individual materials
item = {
"root_material_id": root_material_id,
# "root_material_id": container_node.metadata["base_file"] <- as written in material management model
"id": metadata["id"],
"container_id": metadata["id"], # TODO: Remove duplicate in material manager qml
"guid": metadata["GUID"],
"name": metadata["name"],
"brand": metadata["brand"],
"description": metadata["description"],
"material": metadata["material"],
"color_name": metadata["color_name"],
"color_code": metadata["color_code"],
"density": metadata.get("properties", {}).get("density", ""),
"diameter": metadata.get("properties", {}).get("diameter", ""),
"root_material_id": root_material_id,
"id": metadata["id"],
"container_id": metadata["id"], # TODO: Remove duplicate in material manager qml
"GUID": metadata["GUID"],
"name": metadata["name"],
"brand": metadata["brand"],
"description": metadata["description"],
"material": metadata["material"],
"color_name": metadata["color_name"],
"color_code": metadata["color_code"],
"density": metadata.get("properties", {}).get("density", ""),
"diameter": metadata.get("properties", {}).get("diameter", ""),
"approximate_diameter": metadata["approximate_diameter"],
"adhesion_info": metadata["adhesion_info"],
"is_read_only": self._container_registry.isReadOnly(metadata["id"]),
"container_node": container_node,
"is_favorite": root_material_id in favorites
"adhesion_info": metadata["adhesion_info"],
"is_read_only": self._container_registry.isReadOnly(metadata["id"]),
"container_node": container_node,
"is_favorite": root_material_id in favorites
}
brand_group_dict[brand][material_type].append(item)