diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 81000157bf..d1025a3f5d 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -933,7 +933,7 @@ static std::vector s_Preset_print_options { "set_other_flow_ratios", "first_layer_flow_ratio", "outer_wall_flow_ratio", "inner_wall_flow_ratio", "overhang_flow_ratio", "sparse_infill_flow_ratio", "internal_solid_infill_flow_ratio", "gap_fill_flow_ratio", "support_flow_ratio", "support_interface_flow_ratio", "role_based_wipe_speed", "wipe_speed", "accel_to_decel_enable", "accel_to_decel_factor", "wipe_on_loops", "wipe_before_external_loop", "bridge_density","internal_bridge_density", "precise_outer_wall", "bridge_acceleration", - "sparse_infill_acceleration", "internal_solid_infill_acceleration", "tree_support_adaptive_layer_height", "tree_support_auto_brim", + "sparse_infill_acceleration", "internal_solid_infill_acceleration", "tree_support_auto_brim", "tree_support_brim_width", "gcode_comments", "gcode_label_objects", "initial_layer_travel_speed", "exclude_object", "slow_down_layers", "infill_anchor", "infill_anchor_max","initial_layer_min_bead_width", "make_overhang_printable", "make_overhang_printable_angle", "make_overhang_printable_hole_size" ,"notes", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index c525c00755..3ef21ee41f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5762,12 +5762,6 @@ void PrintConfigDef::init_fff_params() def->max_literal = 35; def->mode = comAdvanced; def->set_default_value(new ConfigOptionPercent(30)); - - def = this->add("tree_support_adaptive_layer_height", coBool); - def->label = L("Adaptive layer height"); - def->category = L("Quality"); - def->tooltip = L("Enabling this option means the height of tree support layer except the first will be automatically calculated."); - def->set_default_value(new ConfigOptionBool(1)); def = this->add("tree_support_auto_brim", coBool); def->label = L("Auto brim width"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index e70ff7fdf0..807ce56b36 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -957,7 +957,6 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloat, tree_support_branch_diameter_angle)) ((ConfigOptionFloat, tree_support_angle_slow)) ((ConfigOptionInt, tree_support_wall_count)) - ((ConfigOptionBool, tree_support_adaptive_layer_height)) ((ConfigOptionBool, tree_support_auto_brim)) ((ConfigOptionFloat, tree_support_brim_width)) ((ConfigOptionBool, detect_narrow_internal_solid_infill)) diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 8a97858f14..7cc98209cf 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1138,7 +1138,7 @@ bool PrintObject::invalidate_state_by_config_options( || opt_key == "support_object_first_layer_gap" || opt_key == "support_base_pattern_spacing" || opt_key == "support_expansion" - //|| opt_key == "independent_support_layer_height" // BBS + || opt_key == "independent_support_layer_height" // Orca || opt_key == "support_threshold_angle" || opt_key == "support_threshold_overlap" || opt_key == "support_ironing" @@ -1151,7 +1151,6 @@ bool PrintObject::invalidate_state_by_config_options( || opt_key == "bridge_no_support" || opt_key == "max_bridge_length" || opt_key == "initial_layer_line_width" - || opt_key == "tree_support_adaptive_layer_height" || opt_key == "tree_support_auto_brim" || opt_key == "tree_support_brim_width" || opt_key == "tree_support_top_rate" diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 8b2ffb48b7..c293de353c 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -723,7 +723,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co "support_interface_pattern", "support_interface_top_layers", "support_interface_bottom_layers", "bridge_no_support", "max_bridge_length", "support_top_z_distance", "support_bottom_z_distance", "support_type", "support_on_build_plate_only", "support_critical_regions_only", "support_interface_not_for_body", - "support_object_xy_distance", "support_object_first_layer_gap"/*, "independent_support_layer_height"*/}) + "support_object_xy_distance", "support_object_first_layer_gap", "independent_support_layer_height"}) toggle_field(el, have_support_material); toggle_field("support_threshold_angle", have_support_material && is_auto(support_type)); toggle_field("support_threshold_overlap", config->opt_int("support_threshold_angle") == 0 && have_support_material && is_auto(support_type)); @@ -831,9 +831,6 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co for (auto el : {"flush_into_infill", "flush_into_support", "flush_into_objects"}) toggle_field(el, have_prime_tower); - // BBS: MusangKing - Hide "Independent support layer height" option - toggle_line("independent_support_layer_height", have_support_material && !have_prime_tower); - bool have_avoid_crossing_perimeters = config->opt_bool("reduce_crossing_wall"); toggle_line("max_travel_detour_distance", have_avoid_crossing_perimeters); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c9bc0d5b0c..33d7ccba2f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2587,7 +2587,6 @@ void TabPrint::build() optgroup->append_single_option_line("tree_support_branch_angle", "support_settings_tree#branch-angle"); optgroup->append_single_option_line("tree_support_branch_angle_organic", "support_settings_tree#branch-angle"); optgroup->append_single_option_line("tree_support_angle_slow", "support_settings_tree#preferred-branch-angle"); - optgroup->append_single_option_line("tree_support_adaptive_layer_height", "support_settings_tree"); optgroup->append_single_option_line("tree_support_auto_brim", "support_settings_tree"); optgroup->append_single_option_line("tree_support_brim_width", "support_settings_tree");