diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 79a7524c53..5ff7364e5c 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -497,8 +497,8 @@ static std::vector s_Preset_print_options { "support_material_buildplate_only", "support_tree_angle", "support_tree_angle_slow", "support_tree_branch_diameter", "support_tree_branch_diameter_angle", "support_tree_branch_diameter_double_wall", "support_tree_top_rate", "support_tree_branch_distance", "support_tree_tip_diameter", - "dont_support_bridges", "thick_bridges", "notes", "complete_objects", "extruder_clearance_radius", - "extruder_clearance_height", "gcode_comments", "gcode_label_objects", "output_filename_format", "post_process", "gcode_substitutions", "perimeter_extruder", + "dont_support_bridges", "thick_bridges", "notes", "complete_objects", + "gcode_comments", "gcode_label_objects", "output_filename_format", "post_process", "gcode_substitutions", "perimeter_extruder", "infill_extruder", "solid_infill_extruder", "support_material_extruder", "support_material_interface_extruder", "ooze_prevention", "standby_temperature_delta", "interface_shells", "extrusion_width", "first_layer_extrusion_width", "perimeter_extrusion_width", "external_perimeter_extrusion_width", "infill_extrusion_width", "solid_infill_extrusion_width", @@ -556,7 +556,7 @@ static std::vector s_Preset_printer_options { "max_print_height", "default_print_profile", "inherits", "remaining_times", "silent_mode", "machine_limits_usage", "thumbnails", "thumbnails_format", - "nozzle_high_flow" + "nozzle_high_flow", "extruder_clearance_radius", "extruder_clearance_height" }; static std::vector s_Preset_sla_print_options { diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 70c187107c..04b9e44ca3 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -388,10 +388,6 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig* config) for (auto el : { "ironing_type", "ironing_flowrate", "ironing_spacing", "ironing_speed" }) toggle_field(el, has_ironing); - bool have_sequential_printing = config->opt_bool("complete_objects"); - for (auto el : { "extruder_clearance_radius", "extruder_clearance_height" }) - toggle_field(el, have_sequential_printing); - bool have_ooze_prevention = config->opt_bool("ooze_prevention"); toggle_field("standby_temperature_delta", have_ooze_prevention); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index d5c268be42..ca6df4ec6f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1694,10 +1694,6 @@ void TabPrint::build() page = add_options_page(L("Output options"), "output+page_white"); optgroup = page->new_optgroup(L("Sequential printing")); optgroup->append_single_option_line("complete_objects", "sequential-printing_124589"); - line = { L("Extruder clearance"), "" }; - line.append_option(optgroup->get_option("extruder_clearance_radius")); - line.append_option(optgroup->get_option("extruder_clearance_height")); - optgroup->append_line(line); optgroup = page->new_optgroup(L("Output file")); optgroup->append_single_option_line("gcode_comments"); @@ -2817,6 +2813,10 @@ void TabPrinter::build_fff() optgroup->append_single_option_line("variable_layer_height"); optgroup->append_single_option_line("prefer_clockwise_movements"); + optgroup = page->new_optgroup(L("Sequential printing limits")); + optgroup->append_single_option_line("extruder_clearance_radius"); + optgroup->append_single_option_line("extruder_clearance_height"); + const int gcode_field_height = 15; // 150 const int notes_field_height = 25; // 250 page = add_options_page(L("Custom G-code"), "cog");