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

Rename to available_material_dict

Browse source
This commit is contained in:
Lipu Fei 2018-03-01 15:12:34 +01:00
parent 4b7c8a8a80
commit d6f6dbe45e
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,14 +61,15 @@ class BrandMaterialsModel(ListModel):
return return
extruder_stack = global_stack.extruders[str(self._extruder_position)] extruder_stack = global_stack.extruders[str(self._extruder_position)]
result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack,
if result_dict is None: extruder_stack)
if available_material_dict is None:
self.setItems([]) self.setItems([])
return return
brand_item_list = [] brand_item_list = []
brand_group_dict = {} brand_group_dict = {}
for root_material_id, container_node in result_dict.items(): for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata metadata = container_node.metadata
brand = metadata["brand"] brand = metadata["brand"]
# Only add results for generic materials # Only add results for generic materials
@ -110,4 +111,3 @@ class BrandMaterialsModel(ListModel):
brand_item_list.append(brand_item) brand_item_list.append(brand_item)
self.setItems(brand_item_list) self.setItems(brand_item_list)

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

@ -27,13 +27,14 @@ class GenericMaterialsModel(BaseMaterialsModel):
return return
extruder_stack = global_stack.extruders[str(self._extruder_position)] extruder_stack = global_stack.extruders[str(self._extruder_position)]
result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack,
if result_dict is None: extruder_stack)
if available_material_dict is None:
self.setItems([]) self.setItems([])
return return
item_list = [] item_list = []
for root_material_id, container_node in result_dict.items(): for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata metadata = container_node.metadata
# Only add results for generic materials # Only add results for generic materials
if metadata["brand"].lower() != "generic": if metadata["brand"].lower() != "generic":

8
cura/Machines/Models/MaterialManagementModel.py
View file

@ -66,14 +66,14 @@ class MaterialManagementModel(ListModel):
return return
active_extruder_stack = self._machine_manager.activeStack active_extruder_stack = self._machine_manager.activeStack
result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack,
active_extruder_stack) active_extruder_stack)
if result_dict is None: if available_material_dict is None:
self.setItems([]) self.setItems([])
return return
material_list = [] material_list = []
for root_material_id, container_node in result_dict.items(): for root_material_id, container_node in available_material_dict.items():
keys_to_fetch = ("name", keys_to_fetch = ("name",
"brand", "brand",
"material", "material",