3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move BAM equations to BAM quality profiles as they are very specific - CURA-4248

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-18 13:51:06 +02:00
parent 4b6f04604c
commit 78ba3c3aa0
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -676,15 +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",
"adhesion tendency": "material_adhesion_tendency",
"surface energy": "material_surface_energy"
} }
__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",
"surface_energy": "material_surface_energy"
} }
__material_metadata_setting_map = { __material_metadata_setting_map = {
"GUID": "material_guid" "GUID": "material_guid"

6
resources/definitions/fdmprinter.def.json
View file

@ -3492,7 +3492,7 @@
"default_value": 0.1, "default_value": 0.1,
"type": "float", "type": "float",
"enabled": "support_enable", "enabled": "support_enable",
"value": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2 if (layer_height >= 0.2) else 1) * layer_height", "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')",
"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
}, },
@ -3504,7 +3504,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": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height", "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
"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'",
@ -3748,7 +3748,6 @@
"unit": "%", "unit": "%",
"type": "float", "type": "float",
"default_value": 100, "default_value": 100,
"value": "min(extruderValues('material_surface_energy'))",
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"limit_to_extruder": "support_interface_extruder_nr", "limit_to_extruder": "support_interface_extruder_nr",
@ -3840,7 +3839,6 @@
"zigzag": "Zig Zag" "zigzag": "Zig Zag"
}, },
"default_value": "concentric", "default_value": "concentric",
"value": "'lines' if support_interface_density < 100 and extruderValue(support_interface_extruder_nr, 'material_adhesion_tendency') < 10 else 'concentric'",
"limit_to_extruder": "support_interface_extruder_nr", "limit_to_extruder": "support_interface_extruder_nr",
"enabled": "support_interface_enable and support_enable", "enabled": "support_interface_enable and support_enable",
"settable_per_mesh": false, "settable_per_mesh": false,