mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: filament filter dirty options 

Change-Id: I00e0df4c2f9dc43f12b38e52c87a353b3f3e38fd
Jira: STUDIO-7643
This commit is contained in:
chunmao.guo 2024-07-22 12:20:04 +08:00 committed by lane.wei
parent b78fa4c11c
commit 7280429583
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Tab.cpp
View File

@ -844,7 +844,8 @@ void Tab::decorate()
void Tab::filter_diff_option(std::vector<std::string> &options) void Tab::filter_diff_option(std::vector<std::string> &options)
{ {
for (auto &opt : options) { for (auto &opt : options) {
if (opt.find_last_of('#') == std::string::npos) continue; auto n = opt.find_last_of('#');
if (n == std::string::npos) continue;
bool found = false; bool found = false;
for (auto page : m_pages) { for (auto page : m_pages) {
if (auto iter = page->m_opt_id_map.find(opt); iter != page->m_opt_id_map.end()) { if (auto iter = page->m_opt_id_map.find(opt); iter != page->m_opt_id_map.end()) {
@ -853,7 +854,7 @@ void Tab::filter_diff_option(std::vector<std::string> &options)
break; break;
} }
} }
if (!found) opt.clear(); if (!found) opt = opt.substr(0, n);
} }
options.erase(std::remove(options.begin(), options.end(), ""), options.end()); options.erase(std::remove(options.begin(), options.end(), ""), options.end());
} }
@ -878,10 +879,8 @@ void Tab::update_changed_ui()
update_custom_dirty(dirty_options, nonsys_options); update_custom_dirty(dirty_options, nonsys_options);
if (m_extruder_switch == nullptr || m_extruder_switch->IsEnabled()) { filter_diff_option(dirty_options);
filter_diff_option(dirty_options); filter_diff_option(nonsys_options);
filter_diff_option(nonsys_options);
}
for (auto& it : m_options_list) for (auto& it : m_options_list)
it.second = m_opt_status_value; it.second = m_opt_status_value;