From 9737cd5f36e8fa887a2885f730efae0942c7059d Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Fri, 25 Aug 2023 16:35:06 +0800 Subject: [PATCH] FIX: optimize exhaust fan ui logic 1. Enable open support_activate_air_filtration 2. Fix display exhaust fan params when support_activate_air_filtration is closed jira:STUDIO-4230 Signed-off-by: xun.zhang Change-Id: Ieddba4bb104b6068b5afb4c109ea6b90d7c4045b --- src/libslic3r/PrintConfig.cpp | 2 +- src/slic3r/GUI/Tab.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 566579dd9d..8af0436d3a 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1780,7 +1780,7 @@ void PrintConfigDef::init_fff_params() def =this->add("support_air_filtration",coBool); def->label=L("Support air filtration"); - def->tooltip=L("Decide whether support activating air filtration"); + def->tooltip=L("Enable this if printer physically support air filtration"); def->mode=comDevelop; def->set_default_value(new ConfigOptionBool(false)); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index e041d474cc..1087d598a1 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2870,11 +2870,11 @@ void TabFilament::toggle_options() for (auto el : { "overhang_fan_speed", "overhang_fan_threshold" }) toggle_option(el, has_enable_overhang_bridge_fan); - bool support_air_filtration = this->m_preset_bundle->printers.get_selected_preset().config.opt_bool("support_air_filtration"); + bool support_air_filtration = m_preset_bundle->printers.get_edited_preset().config.opt_bool("support_air_filtration"); toggle_line("activate_air_filtration",is_BBL_printer && support_air_filtration); for (auto elem : { "during_print_exhaust_fan_speed","complete_print_exhaust_fan_speed" }) - toggle_line(elem, m_config->opt_bool("activate_air_filtration",0)); + toggle_line(elem, m_config->opt_bool("activate_air_filtration",0)&&support_air_filtration); } if (m_active_page->title() == "Filament") @@ -3679,8 +3679,7 @@ void TabPrinter::toggle_options() toggle_option("printer_structure", !is_BBL_printer); toggle_option("use_relative_e_distances", !is_BBL_printer); - toggle_option("support_chamber_temp_control",!is_BBL_printer); - toggle_option("support_air_filtration",!is_BBL_printer); + toggle_option("support_air_filtration",is_BBL_printer); auto flavor = m_config->option>("gcode_flavor")->value; bool is_marlin_flavor = flavor == gcfMarlinLegacy || flavor == gcfMarlinFirmware; // Disable silent mode for non-marlin firmwares.