GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Document and rename getFallbackMaterialIdByMaterialType()

Browse Source
This commit is contained in:
Lipu Fei 2018-03-01 11:31:18 +01:00
parent ea2b076dbd
commit 50c61c9934
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Machines/MaterialManager.py
View File

@ -307,10 +307,15 @@ class MaterialManager(QObject):
# For materials such as ultimaker_pla_orange, no quality profiles may be found, so we should fall back to use # For materials such as ultimaker_pla_orange, no quality profiles may be found, so we should fall back to use
# the generic material IDs to search for qualities. # the generic material IDs to search for qualities.
# #
# An example would be, suppose we have machine with preferred material set to "filo3d_pla" (1.75mm), but its
# extruders only use 2.85mm materials, then we won't be able to find the preferred material for this machine.
# A fallback would be to fetch a generic material of the same type "PLA" as "filo3d_pla", and in this case it will
# be "generic_pla". This function is intended to get a generic fallback material for the given material type.
#
# This function returns the generic root material ID for the given material type, where material types are "PLA", # This function returns the generic root material ID for the given material type, where material types are "PLA",
# "ABS", etc. # "ABS", etc.
# #
def getFallbackMaterialId(self, material_type: str) -> str: def getFallbackMaterialIdByMaterialType(self, material_type: str) -> str:
# For safety # For safety
if material_type not in self._fallback_materials_map: if material_type not in self._fallback_materials_map:
Logger.log("w", "The material type [%s] does not have a fallback material" % material_type) Logger.log("w", "The material type [%s] does not have a fallback material" % material_type)

2
cura/Machines/QualityManager.py
View File

@ -376,7 +376,7 @@ class QualityManager(QObject):
# Also try to get the fallback material # Also try to get the fallback material
material_type = extruder.material.getMetaDataEntry("material") material_type = extruder.material.getMetaDataEntry("material")
fallback_root_material_id = self._material_manager.getFallbackMaterialId(material_type) fallback_root_material_id = self._material_manager.getFallbackMaterialIdByMaterialType(material_type)
if fallback_root_material_id: if fallback_root_material_id:
root_material_id_list.append(fallback_root_material_id) root_material_id_list.append(fallback_root_material_id)