From b9d9602581ad6e11f2374580280dcb26048c1ce3 Mon Sep 17 00:00:00 2001 From: "jiangkai.zhao" Date: Mon, 20 Jan 2025 11:25:31 +0800 Subject: [PATCH] ENH: adjust the interaction of the rib_wall jira: none Change-Id: I2462240304fc4ce4a1047d7c8ac818c209f15200 (cherry picked from commit 6567642e938a4edd4197535418aeb8be0bbc7c55) (cherry picked from commit 1f4d2cf714e70ab27ceaaeb75df02650f527b570) --- src/libslic3r/PrintConfig.cpp | 2 +- src/slic3r/GUI/ConfigManipulation.cpp | 7 +++++-- src/slic3r/GUI/Tab.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b6d41ff6a8..94761d009b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -6064,7 +6064,7 @@ void PrintConfigDef::init_fff_params() def->label = L("rib wall"); def->tooltip = L("The wall of prime tower will add four ribs"); def->mode = comAdvanced; - def->set_default_value(new ConfigOptionBool(true)); + def->set_default_value(new ConfigOptionBool(false)); def = this->add("prime_tower_fillet_wall", coBool); def->label = L("fillet wall"); diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index d24cc20892..6e660fe6a5 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -758,10 +758,13 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line("preheat_steps", have_ooze_prevention && (preheat_steps > 0)); bool have_prime_tower = config->opt_bool("enable_prime_tower"); - for (auto el : {"prime_tower_width", "prime_tower_brim_width", "prime_tower_outer_first", "prime_tower_skip_points", "prime_tower_rib_wall" - "prime_tower_extra_rib_length", "prime_tower_rib_width", "prime_tower_fillet_wall"}) + for (auto el : {"prime_tower_width", "prime_tower_brim_width", "prime_tower_outer_first", "prime_tower_skip_points", "prime_tower_rib_wall"}) toggle_line(el, have_prime_tower); + bool have_rib_wall = config->opt_bool("prime_tower_rib_wall")&&have_prime_tower; + for (auto el : {"prime_tower_extra_rib_length", "prime_tower_rib_width", "prime_tower_fillet_wall"}) + toggle_line(el, have_rib_wall); + for (auto el : {"wall_filament", "sparse_infill_filament", "solid_infill_filament", "wipe_tower_filament"}) toggle_line(el, !bSEMM); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index d7125ac2e9..c2700837af 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2448,10 +2448,10 @@ void TabPrint::build() optgroup->append_single_option_line("enable_prime_tower", "multimaterial_settings_prime_tower"); optgroup->append_single_option_line("prime_tower_outer_first", "parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_skip_points", "parameter/prime-tower"); - optgroup->append_single_option_line("prime_tower_rib_wall", "parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_width", "multimaterial_settings_prime_tower#width"); optgroup->append_single_option_line("prime_volume", "multimaterial_settings_prime_tower"); optgroup->append_single_option_line("prime_tower_brim_width", "multimaterial_settings_prime_tower#brim-width"); + optgroup->append_single_option_line("prime_tower_rib_wall", "parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_extra_rib_length","parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_rib_width","parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_fillet_wall","parameter/prime-tower");