diff --git a/plugins/3MFWriter/SettingsExportModel.py b/plugins/3MFWriter/SettingsExportModel.py index 99ffad4bac..674b0da287 100644 --- a/plugins/3MFWriter/SettingsExportModel.py +++ b/plugins/3MFWriter/SettingsExportModel.py @@ -39,7 +39,7 @@ class SettingsExportModel(QObject): 'adaptive_layer_height_enabled', 'brim_gap', 'support_offset', - 'brim_outside_only', + 'brim_location', 'magic_spiralize', 'slicing_tolerance', 'outer_inset_first', diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 28884a894a..5baadf32e4 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -14,7 +14,7 @@ { "acceleration_print": { "default_value": 1000 }, "adhesion_type": { "default_value": "skirt" }, - "brim_outside_only": { "default_value": false }, + "brim_location": { "default_value": "everywhere" }, "default_material_print_temperature": { "default_value": 220 }, "infill_sparse_density": { "default_value": 20 }, "ironing_flow": { "default_value": 7.0 }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2abdf0df01..784b223500 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6069,12 +6069,18 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "brim_outside_only": + "brim_location": { - "label": "Brim Only on Outside", - "description": "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much.", - "type": "bool", - "default_value": true, + "label": "Brim Location", + "description": "Print a brim on the outside of the model, inside, or both. Depending on the model, this helps reducing the amount of brim you need to remove afterwards, while ensuring a proper bed adhesion.", + "type": "enum", + "options": + { + "outside": "Outside Only", + "inside": "Inside Only", + "everywhere": "Everywhere" + }, + "default_value": "outside", "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", "settable_per_mesh": false, @@ -6082,13 +6088,14 @@ }, "brim_inside_margin": { - "label": "Brim Inside Avoid Margin", - "description": "A part fully enclosed inside another part can generate an outer brim that touches the inside of the other part. This removes all brim within this distance from internal holes.", + "label": "Brim Avoid Margin", + "description": "A brim around a surface may touch an other surface where brim is not expected. This removes all brim within this distance from brimless surfaces.", "unit": "mm", "type": "float", - "default_value": 2.5, + "value": "line_width * 4", + "default_value": "1.6", "minimum_value": "0", - "enabled": "resolveOrValue('adhesion_type') == 'brim' and any(extruderValues('brim_outside_only'))", + "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 554b188b82..1d95bbbde4 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -113,7 +113,7 @@ "minimum_value_warning": "100" }, "adhesion_type": { "value": "'skirt'" }, - "brim_outside_only": { "value": false }, + "brim_location": { "value": "everywhere" }, "cool_fan_speed_min": { "value": "0.5*cool_fan_speed" }, "cool_min_layer_time_fan_speed_max": { "value": 10 }, "default_material_bed_temperature": { "maximum_value": "150" }, diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index f4da80ded9..59fec06a3e 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] adhesion_type = brim brim_line_count = 14 -brim_outside_only = True +brim_location = outside brim_width = 8 connect_infill_polygons = True cool_fan_enabled = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index a052562cd3..549c24a6c6 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] adhesion_type = brim brim_line_count = 14 -brim_outside_only = True +brim_location = outside brim_width = 8 connect_infill_polygons = True cool_fan_enabled = True diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 55a36075be..652f33b4a4 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -124,7 +124,7 @@ adhesion_extruder_nr skirt_line_count brim_width brim_line_count -brim_outside_only +brim_location [dual] prime_tower_enable diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 130b2580a4..ce5b78c76c 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -327,7 +327,7 @@ skirt_brim_minimal_length brim_width brim_gap brim_line_count -brim_outside_only +brim_location brim_smart_ordering raft_margin raft_smoothing