GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 21:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3908 from Ultimaker/CURA-5444_pva_default_hardware_compatible

Browse Source 
CURA-5444: These are merged, but the branches are not deleted, so that we can also open a new PR to merge into 3.4.
This commit is contained in:
Ian Paschal 2018-06-08 14:47:39 +02:00 committed by GitHub
commit dc5a48fb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -632,7 +632,8 @@ class XmlMaterialProfile(InstanceContainer):
machine_manufacturer = identifier.get("manufacturer", definition.get("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition. machine_manufacturer = identifier.get("manufacturer", definition.get("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition.
if machine_compatibility: # Always create the instance of the material even if it is not compatible, otherwise it will never
# show as incompatible if the material profile doesn't define hotends in the machine - CURA-5444
new_material_id = self.getId() + "_" + machine_id new_material_id = self.getId() + "_" + machine_id
# The child or derived material container may already exist. This can happen when a material in a # The child or derived material container may already exist. This can happen when a material in a
@ -871,7 +872,8 @@ class XmlMaterialProfile(InstanceContainer):
machine_manufacturer = identifier.get("manufacturer", definition_metadata.get("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition. machine_manufacturer = identifier.get("manufacturer", definition_metadata.get("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition.
if machine_compatibility: # Always create the instance of the material even if it is not compatible, otherwise it will never
# show as incompatible if the material profile doesn't define hotends in the machine - CURA-5444
new_material_id = container_id + "_" + machine_id new_material_id = container_id + "_" + machine_id
# Do not look for existing container/container metadata with the same ID although they may exist. # Do not look for existing container/container metadata with the same ID although they may exist.

1
plugins/XmlMaterialProfile/product_to_id.json
View File

@ -8,5 +8,6 @@
"Ultimaker 3 Extended": "ultimaker3_extended", "Ultimaker 3 Extended": "ultimaker3_extended",
"Ultimaker Original": "ultimaker_original", "Ultimaker Original": "ultimaker_original",
"Ultimaker Original+": "ultimaker_original_plus", "Ultimaker Original+": "ultimaker_original_plus",
"Ultimaker Original Dual Extrusion": "ultimaker_original_dual",
"IMADE3D JellyBOX": "imade3d_jellybox" "IMADE3D JellyBOX": "imade3d_jellybox"
} }