From 1f4d2cf714e70ab27ceaaeb75df02650f527b570 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) --- 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 6935cc147..28d93b37d 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -4378,7 +4378,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 224a2e337..555574957 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -678,10 +678,13 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, in toggle_field("standby_temperature_delta", have_ooze_prevention); bool have_prime_tower = config->opt_bool("enable_prime_tower"); - for (auto el : {"prime_tower_width", "prime_volume", "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_volume", "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 : {"flush_into_infill", "flush_into_support", "flush_into_objects"}) toggle_field(el, have_prime_tower); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 35bdf6505..151c2f9fc 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2226,10 +2226,10 @@ void TabPrint::build() optgroup->append_single_option_line("enable_prime_tower","parameter/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","parameter/prime-tower"); optgroup->append_single_option_line("prime_volume","parameter/prime-tower"); optgroup->append_single_option_line("prime_tower_brim_width","parameter/prime-tower"); + 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");