From d6f6dbe45efd799b987928cbc679bd2850ae2c66 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 1 Mar 2018 15:12:34 +0100 Subject: [PATCH] Rename to available_material_dict --- cura/Machines/Models/BrandMaterialsModel.py | 8 ++++---- cura/Machines/Models/GenericMaterialsModel.py | 7 ++++--- cura/Machines/Models/MaterialManagementModel.py | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cura/Machines/Models/BrandMaterialsModel.py b/cura/Machines/Models/BrandMaterialsModel.py index 74518adcd6..ec1e3c7ebe 100644 --- a/cura/Machines/Models/BrandMaterialsModel.py +++ b/cura/Machines/Models/BrandMaterialsModel.py @@ -61,14 +61,15 @@ class BrandMaterialsModel(ListModel): return extruder_stack = global_stack.extruders[str(self._extruder_position)] - result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) - if result_dict is None: + available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, + extruder_stack) + if available_material_dict is None: self.setItems([]) return brand_item_list = [] 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 brand = metadata["brand"] # Only add results for generic materials @@ -110,4 +111,3 @@ class BrandMaterialsModel(ListModel): brand_item_list.append(brand_item) self.setItems(brand_item_list) - diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index da7ef686d3..f5b18adde9 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -27,13 +27,14 @@ class GenericMaterialsModel(BaseMaterialsModel): return extruder_stack = global_stack.extruders[str(self._extruder_position)] - result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) - if result_dict is None: + available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, + extruder_stack) + if available_material_dict is None: self.setItems([]) return 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 # Only add results for generic materials if metadata["brand"].lower() != "generic": diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index abff1d6010..b250232282 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -66,14 +66,14 @@ class MaterialManagementModel(ListModel): return active_extruder_stack = self._machine_manager.activeStack - result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, - active_extruder_stack) - if result_dict is None: + available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, + active_extruder_stack) + if available_material_dict is None: self.setItems([]) return 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", "brand", "material",