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

Remove unused getIdsFromFile

Browse source 
Since we now return all metadata at once from every file, we don't need this any more. We need to side-load the metadata anyway.

Contributes to issue CURA-4243.
This commit is contained in:
Ghostkeeper 2017-11-23 16:11:02 +01:00
parent 3ee2e0488f
commit 1e07325d8f
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 0 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

45
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -799,51 +799,6 @@ class XmlMaterialProfile(InstanceContainer):
return result_metadata
## Override of getIdsFromFile because the XML files contain multiple IDs.
@classmethod
def getIdsFromFile(cls, file_name):
result_ids = super().getIdsFromFile(file_name) #The base file has the default ID, taken from the file name without extension.
base_id = result_ids[0]
try:
data = ET.parse(file_name)
except: #IOError, PermissionError, or anything from the ElementTree library.
Logger.logException("e", "An exception occurred while parsing the material profile")
return
common_compatibility = True
compatible_entries = data.iterfind("./um:settings/um:setting[@key='hardware compatible']", cls.__namespaces)
try:
common_compatibility = cls._parseCompatibleValue(next(compatible_entries).text)
except StopIteration: #No 'hardware compatible' setting.
pass
#Get a mapping from the product names to the definition IDs.
product_id_map = cls.getProductIdMap()
for machine in data.iterfind("./um:settings/um:machine", cls.__namespaces):
machine_compatibility = common_compatibility
compatible_entries = data.iterfind("./um:setting[@key='hardware compatible']", cls.__namespaces)
try:
machine_compatibility = cls._parseCompatibleValue(next(compatible_entries).text)
except StopIteration: #No 'hardware compatible' setting.
pass
for identifier in machine.iterfind("./um:machine_identifier", cls.__namespaces): #For all machines.
machine_id = product_id_map.get(identifier.get("product"), None)
if machine_id is None:
#Let's try again with some naive heuristics.
machine_id = identifier.get("product").replace(" ", "").lower()
if machine_compatibility:
result_ids.append(base_id + "_" + machine_id)
for hotend in machine.iterfind("./um:hotend", cls.__namespaces): #For all hotends.
hotend_id = hotend.get("id")
if hotend_id is None:
continue
result_ids.append(base_id + "_" + machine_id + "_" + hotend_id)
return result_ids
def _addSettingElement(self, builder, instance):
try:
key = UM.Dictionary.findKey(self.__material_settings_setting_map, instance.definition.key)