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

FIX: add filament should reset ComboBox 

jira: STUDIO-6937
Change-Id: Ifabd27d1d74369245edbb47b095fcd448b6626fc
This commit is contained in:
zhou.xu 2024-04-23 10:47:04 +08:00 committed by Lane.Wei
parent a446c7aae6
commit f525c6ae35
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/ObjColorDialog.cpp
View File

@ -395,8 +395,9 @@ void ObjColorPanel::update_filament_ids()
{ {
if (m_is_add_filament) { if (m_is_add_filament) {
for (auto c:m_new_add_colors) { for (auto c:m_new_add_colors) {
auto evt = new ColorEvent(EVT_ADD_CUSTOM_FILAMENT, c); /*auto evt = new ColorEvent(EVT_ADD_CUSTOM_FILAMENT, c);
wxQueueEvent(wxGetApp().plater(), evt); wxQueueEvent(wxGetApp().plater(), evt);*/
wxGetApp().sidebar().add_custom_filament(c);
} }
} }
//deal m_filament_ids //deal m_filament_ids
@ -725,15 +726,17 @@ void ObjColorPanel::deal_default_strategy()
void ObjColorPanel::deal_add_btn() void ObjColorPanel::deal_add_btn()
{ {
if (m_colours.size() > g_max_color) { return; } if (m_colours.size() > g_max_color) { return; }
deal_reset_btn();
std::vector<wxBitmap *> new_icons; std::vector<wxBitmap *> new_icons;
auto new_color_size = m_cluster_colors_from_algo.size(); auto new_color_size = m_cluster_colors_from_algo.size();
new_icons.reserve(new_color_size); new_icons.reserve(new_color_size);
m_new_add_colors.clear(); m_new_add_colors.clear();
m_new_add_colors.reserve(new_color_size); m_new_add_colors.reserve(new_color_size);
int new_index = m_colours.size() + 1; int new_index = m_colours.size() + 1;
bool is_exceed = false;
for (size_t i = 0; i < new_color_size; i++) { for (size_t i = 0; i < new_color_size; i++) {
if (m_colours.size() + new_icons.size() >= g_max_color) { if (m_colours.size() + new_icons.size() >= g_max_color) {
m_warning_text->SetLabelText(_L("Waring:The count of newly added and \n current extruders exceeds 16.")); is_exceed = true;
break; break;
} }
wxColour cur_color = convert_to_wxColour(m_cluster_colors_from_algo[i]); wxColour cur_color = convert_to_wxColour(m_cluster_colors_from_algo[i]);
@ -753,6 +756,10 @@ void ObjColorPanel::deal_add_btn()
m_cluster_map_filaments[i] = new_index; m_cluster_map_filaments[i] = new_index;
new_index++; new_index++;
} }
if (is_exceed) {
deal_approximate_match_btn();
m_warning_text->SetLabelText(_L("Waring:The count of newly added and \n current extruders exceeds 16."));
}
m_is_add_filament = true; m_is_add_filament = true;
} }