Remove dependancy to prime tower brim

CURA-10783
This commit is contained in:
Erwan MATHIEU 2023-10-13 07:47:22 +02:00
parent dcd01db7c4
commit 1d8de818ed

View File

@ -5895,7 +5895,7 @@
"type": "optional_extruder",
"default_value": "-1",
"value": "int(defaultExtruderPosition()) if resolveOrValue('adhesion_type') == 'raft' else -1",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none')",
"resolve": "max(extruderValues('adhesion_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -5908,7 +5908,7 @@
"type": "optional_extruder",
"default_value": "-1",
"value": "adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') in ['skirt', 'brim'] or resolveOrValue('prime_tower_brim_enable'))",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') in ['skirt', 'brim'])",
"resolve": "max(extruderValues('skirt_brim_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
@ -6005,7 +6005,7 @@
"minimum_value": "0",
"minimum_value_warning": "25",
"maximum_value_warning": "2500",
"enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')",
"enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -6019,7 +6019,7 @@
"default_value": 8.0,
"minimum_value": "0.0",
"maximum_value_warning": "50.0",
"enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')",
"enabled": "resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -6034,7 +6034,7 @@
"minimum_value": "0",
"maximum_value_warning": "50 / skirt_brim_line_width",
"value": "math.ceil(brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
"enabled": "resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')",
"enabled": "resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -6673,15 +6673,54 @@
},
"prime_tower_brim_enable":
{
"label": "Prime Tower Brim",
"description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.",
"value": "resolveOrValue('adhesion_type') in ('skirt', 'brim', 'raft')",
"label": "Prime Tower Base",
"description": "Prime-towers might need the extra adhesion afforded by a brim or raft, even if the model doesn't.",
"type": "bool",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')",
"resolve": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') in ('none', 'skirt', 'brim'))",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') not in ('none', 'raft'))",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false
},
"prime_tower_base_size":
{
"value": "resolveOrValue('brim_width')",
"label": "Prime Tower Base Size",
"description": "The width of the prime tower base.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_brim_enable')",
"default_value": "resolveOrValue('brim_width')",
"minimum_value": "0",
"maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"prime_tower_base_height":
{
"label": "Prime Tower Base Height",
"description": "The height of the prime tower base.",
"type": "float",
"unit": "mm",
"enabled": "resolveOrValue('prime_tower_brim_enable')",
"default_value": 0,
"minimum_value": "0",
"maximum_value": "machine_height",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"prime_tower_base_curve_magnitude":
{
"label": "Prime Tower Base Curve Magnitude",
"description": "The magnitude factor used for the curve of the prime tower foot.",
"type": "int",
"enabled": "resolveOrValue('prime_tower_brim_enable')",
"default_value": 4,
"minimum_value": "0",
"maximum_value": "10",
"settable_per_mesh": false,
"settable_per_extruder": false
},
"ooze_shield_enabled":
{
"label": "Enable Ooze Shield",