diff --git a/resources/profiles/Anker.json b/resources/profiles/Anker.json index 4f1c37746..ab40c9f20 100644 --- a/resources/profiles/Anker.json +++ b/resources/profiles/Anker.json @@ -1,6 +1,6 @@ { "name": "Anker", - "version": "01.10.00.01", + "version": "02.00.00.01", "force_update": "0", "description": "Anker configurations", "machine_model_list": [ diff --git a/resources/profiles/Anker/process/fdm_process_common.json b/resources/profiles/Anker/process/fdm_process_common.json index a9cff6ce2..ca25aa95d 100644 --- a/resources/profiles/Anker/process/fdm_process_common.json +++ b/resources/profiles/Anker/process/fdm_process_common.json @@ -89,7 +89,7 @@ "travel_speed": "300", "travel_speed_z": "0", "enable_arc_fitting": "0", - "ensure_vertical_shell_thickness": "1", + "ensure_vertical_shell_thickness": "enabled", "precise_outer_wall": "1", "independent_support_layer_height": "1", "default_jerk": "15", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 120ac92f5..4c5007963 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1329,14 +1329,6 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionStrings { " " }); - def = this->add("ensure_vertical_shell_thickness", coBool); - def->label = L("Ensure vertical shell thickness"); - def->category = L("Strength"); - def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness " - "(top+bottom solid layers)"); - def->mode = comAdvanced; - def->set_default_value(new ConfigOptionBool(true)); - def = this->add("ensure_vertical_shell_thickness", coEnum); def->label = L("Ensure vertical shell thickness"); def->category = L("Strength"); diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index cbc69dfd7..9c4eecb16 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -301,7 +301,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con sparse_infill_density == 0 && !config->opt_bool("enable_support") && config->opt_int("enforce_support_layers") == 0 && - config->opt_bool("ensure_vertical_shell_thickness") && + config->opt_enum("ensure_vertical_shell_thickness") == EnsureVerticalThicknessLevel::evtEnabled && !config->opt_bool("detect_thin_wall") && config->opt_enum("timelapse_type") == TimelapseType::tlTraditional && !config->opt_bool("z_direction_outwall_speed_continuous"))) @@ -315,7 +315,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con new_conf.set_key_value("sparse_infill_density", new ConfigOptionPercent(0)); new_conf.set_key_value("enable_support", new ConfigOptionBool(false)); new_conf.set_key_value("enforce_support_layers", new ConfigOptionInt(0)); - new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(true)); + new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionEnum(EnsureVerticalThicknessLevel::evtEnabled)); new_conf.set_key_value("detect_thin_wall", new ConfigOptionBool(false)); new_conf.set_key_value("timelapse_type", new ConfigOptionEnum(tlTraditional)); new_conf.set_key_value("z_direction_outwall_speed_continuous", new ConfigOptionBool(false)); diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index ee763ead1..4b4881941 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -2150,7 +2150,7 @@ void PartPlate::set_vase_mode_related_object_config(int obj_id) { new_conf.set_key_value("sparse_infill_density", new ConfigOptionPercent(0)); new_conf.set_key_value("enable_support", new ConfigOptionBool(false)); new_conf.set_key_value("enforce_support_layers", new ConfigOptionInt(0)); - new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(true)); + new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionEnum(EnsureVerticalThicknessLevel::evtEnabled)); new_conf.set_key_value("detect_thin_wall", new ConfigOptionBool(false)); new_conf.set_key_value("timelapse_type", new ConfigOptionEnum(tlTraditional)); auto applying_keys = global_config->diff(new_conf); @@ -4526,7 +4526,7 @@ int PartPlateList::notify_instance_update(int obj_id, int instance_id, bool is_n config.has("sparse_infill_density") && config.option("sparse_infill_density")->value == 0 && config.has("enable_support") && !config.opt_bool("enable_support") && config.has("enforce_support_layers") && config.opt_int("enforce_support_layers") == 0 && - config.has("ensure_vertical_shell_thickness") && config.opt_bool("ensure_vertical_shell_thickness") && + config.has("ensure_vertical_shell_thickness") && config.opt_enum("ensure_vertical_shell_thickness") == EnsureVerticalThicknessLevel::evtEnabled && config.has("detect_thin_wall") && !config.opt_bool("detect_thin_wall") && config.has("timelapse_type") && config.opt_enum("timelapse_type") == TimelapseType::tlTraditional) return true;