update material xml parser to support psp values - CURA-4253

This commit is contained in:
ChrisTerBeke 2017-10-16 15:55:46 +02:00
parent fae65d7b83
commit a444e5c883
2 changed files with 6 additions and 4 deletions

View file

@ -676,13 +676,15 @@ class XmlMaterialProfile(InstanceContainer):
"processing temperature graph": "material_flow_temp_graph", "processing temperature graph": "material_flow_temp_graph",
"print cooling": "cool_fan_speed", "print cooling": "cool_fan_speed",
"retraction amount": "retraction_amount", "retraction amount": "retraction_amount",
"retraction speed": "retraction_speed" "retraction speed": "retraction_speed",
"support interface density": "support_interface_density"
} }
__unmapped_settings = [ __unmapped_settings = [
"hardware compatible" "hardware compatible"
] ]
__material_properties_setting_map = { __material_properties_setting_map = {
"diameter": "material_diameter" "diameter": "material_diameter",
"adhesion_tendency": "material_adhesion_tendency"
} }
__material_metadata_setting_map = { __material_metadata_setting_map = {
"GUID": "material_guid" "GUID": "material_guid"

View file

@ -3469,7 +3469,7 @@
"default_value": 0.1, "default_value": 0.1,
"type": "float", "type": "float",
"enabled": "support_enable", "enabled": "support_enable",
"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2 if (layer_height >= 0.2) 1) * layer_height",
"limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
@ -3481,7 +3481,7 @@
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"default_value": 0.1, "default_value": 0.1,
"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2) * layer_height",
"limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
"type": "float", "type": "float",
"enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'", "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'",