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

ENH:reduce unnecessary filament in obj import 

jira: none
Change-Id: I417b889204e4fa6f9dc2860695ef71518a5f6095
This commit is contained in:
zhou.xu 2024-09-04 11:21:49 +08:00 committed by Lane.Wei
parent b51ff1721d
commit bdde293d45
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,7 @@ bool ObjColorPanel::is_ok() {
void ObjColorPanel::update_filament_ids() 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_final_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); wxGetApp().sidebar().add_custom_filament(c);
@ -451,7 +451,7 @@ wxBoxSizer *ObjColorPanel::create_reset_btn_sizer(wxWindow *parent)
StateColor calc_btn_text(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)); StateColor calc_btn_text(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
// create btn // create btn
m_quick_reset_btn = new Button(parent, _L("Reset")); m_quick_reset_btn = new Button(parent, _L("Reset"));
m_quick_add_btn->SetToolTip(_L("Reset mapped extruders.")); m_quick_reset_btn->SetToolTip(_L("Reset mapped extruders."));
auto cur_btn = m_quick_reset_btn; auto cur_btn = m_quick_reset_btn;
cur_btn->SetFont(Label::Body_13); cur_btn->SetFont(Label::Body_13);
cur_btn->SetMinSize(wxSize(FromDIP(60), FromDIP(20))); cur_btn->SetMinSize(wxSize(FromDIP(60), FromDIP(20)));
@ -520,7 +520,13 @@ ComboBox *ObjColorPanel::CreateEditorCtrl(wxWindow *parent, int id) // wxRect la
c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &evt) { c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &evt) {
auto *com_box = static_cast<ComboBox *>(evt.GetEventObject()); auto *com_box = static_cast<ComboBox *>(evt.GetEventObject());
int i = atoi(com_box->GetName().c_str()); int i = atoi(com_box->GetName().c_str());
if (i < m_cluster_map_filaments.size()) { m_cluster_map_filaments[i] = com_box->GetSelection(); } if (i < m_cluster_map_filaments.size()) {
m_cluster_map_filaments[i] = com_box->GetSelection();
if (m_cluster_map_filaments[i] > m_max_filament_index) {
m_max_filament_index = m_cluster_map_filaments[i];
update_new_add_final_colors();
}
}
evt.StopPropagation(); evt.StopPropagation();
}); });
return c_editor; return c_editor;
@ -548,7 +554,11 @@ void ObjColorPanel::deal_approximate_match_btn()
auto new_index= color_dists[0].id; auto new_index= color_dists[0].id;
m_result_icon_list[i]->bitmap_combox->SetSelection(new_index); m_result_icon_list[i]->bitmap_combox->SetSelection(new_index);
m_cluster_map_filaments[i] = new_index; m_cluster_map_filaments[i] = new_index;
if (new_index > m_max_filament_index) {
m_max_filament_index = new_index;
}
} }
update_new_add_final_colors();
} }
void ObjColorPanel::show_sizer(wxSizer *sizer, bool show) void ObjColorPanel::show_sizer(wxSizer *sizer, bool show)
@ -662,6 +672,16 @@ void ObjColorPanel::draw_table()
m_scrolledWindow->SetScrollRate(20, 20); m_scrolledWindow->SetScrollRate(20, 20);
} }
void ObjColorPanel::update_new_add_final_colors()
{
m_new_add_final_colors = m_new_add_colors;
if (m_max_filament_index <= m_colours.size()) { // Fix 20240904
m_new_add_final_colors.clear();
} else {
m_new_add_final_colors.resize(m_max_filament_index - m_colours.size());
}
}
void ObjColorPanel::deal_algo(char cluster_number, bool redraw_ui) void ObjColorPanel::deal_algo(char cluster_number, bool redraw_ui)
{ {
if (m_last_cluster_number == cluster_number) { if (m_last_cluster_number == cluster_number) {
@ -749,6 +769,7 @@ void ObjColorPanel::deal_reset_btn()
} }
m_is_add_filament = false; m_is_add_filament = false;
m_new_add_colors.clear(); m_new_add_colors.clear();
m_new_add_final_colors.clear();
m_warning_text->SetLabelText(""); m_warning_text->SetLabelText("");
} }

3
src/slic3r/GUI/ObjColorDialog.hpp
View File

@ -41,6 +41,7 @@ private:
void update_color_icon_and_rgba_sizer(int id, const wxColour &color); void update_color_icon_and_rgba_sizer(int id, const wxColour &color);
ComboBox* CreateEditorCtrl(wxWindow *parent,int id); ComboBox* CreateEditorCtrl(wxWindow *parent,int id);
void draw_table(); void draw_table();
void update_new_add_final_colors();
void show_sizer(wxSizer *sizer, bool show); void show_sizer(wxSizer *sizer, bool show);
void redraw_part_table(); void redraw_part_table();
void deal_approximate_match_btn(); void deal_approximate_match_btn();
@ -78,9 +79,11 @@ private:
int m_input_colors_size{0}; int m_input_colors_size{0};
std::vector<wxColour> m_colours;//from project and show right std::vector<wxColour> m_colours;//from project and show right
std::vector<int> m_cluster_map_filaments;//show middle std::vector<int> m_cluster_map_filaments;//show middle
int m_max_filament_index = 0;
std::vector<wxColour> m_cluster_colours;//from_algo and show left std::vector<wxColour> m_cluster_colours;//from_algo and show left
bool m_can_add_filament{true}; bool m_can_add_filament{true};
std::vector<wxColour> m_new_add_colors; std::vector<wxColour> m_new_add_colors;
std::vector<wxColour> m_new_add_final_colors;
//algo result //algo result
std::vector<Slic3r::RGBA> m_cluster_colors_from_algo; std::vector<Slic3r::RGBA> m_cluster_colors_from_algo;
std::vector<int> m_cluster_labels_from_algo; std::vector<int> m_cluster_labels_from_algo;