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

FIX:gcode.3mf file needs to open the plate_toolbar 

Jira: STUDIO-5686
Change-Id: I43824cbaaae59e54ccab2298da52c080e1567713
This commit is contained in:
zhou.xu 2023-12-27 09:52:16 +08:00 committed by Lane.Wei
parent 3ac6112178
commit 9b71e176d9
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1650,6 +1650,11 @@ void GLCanvas3D::enable_select_plate_toolbar(bool enable)
m_sel_plate_toolbar.set_enabled(enable); m_sel_plate_toolbar.set_enabled(enable);
} }
void GLCanvas3D::clear_select_plate_toolbar_render_flag()
{
m_sel_plate_toolbar.is_render_finish = false;
}
void GLCanvas3D::enable_assemble_view_toolbar(bool enable) void GLCanvas3D::enable_assemble_view_toolbar(bool enable)
{ {
m_assemble_view_toolbar.set_enabled(enable); m_assemble_view_toolbar.set_enabled(enable);

1
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -795,6 +795,7 @@ public:
void _update_select_plate_toolbar_stats_item(bool force_selected = false); void _update_select_plate_toolbar_stats_item(bool force_selected = false);
void reset_select_plate_toolbar_selection(); void reset_select_plate_toolbar_selection();
void enable_select_plate_toolbar(bool enable); void enable_select_plate_toolbar(bool enable);
void clear_select_plate_toolbar_render_flag();
void enable_assemble_view_toolbar(bool enable); void enable_assemble_view_toolbar(bool enable);
void enable_return_toolbar(bool enable); void enable_return_toolbar(bool enable);
void enable_separator_toolbar(bool enable); void enable_separator_toolbar(bool enable);

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

@ -1870,6 +1870,14 @@ std::string& Sidebar::get_search_line()
return p->searcher.search_string(); return p->searcher.search_string();
} }
void Sidebar::set_is_gcode_file(bool flag)
{
m_is_gcode_file = flag;
if (m_is_gcode_file) {
wxGetApp().plater()->force_update_all_plate_thumbnails();
}
}
void Sidebar::auto_calc_flushing_volumes(const int modify_id) { void Sidebar::auto_calc_flushing_volumes(const int modify_id) {
auto& project_config = wxGetApp().preset_bundle->project_config; auto& project_config = wxGetApp().preset_bundle->project_config;
auto& printer_config = wxGetApp().preset_bundle->printers.get_edited_preset().config; auto& printer_config = wxGetApp().preset_bundle->printers.get_edited_preset().config;
@ -5802,7 +5810,7 @@ void Plater::priv::set_current_panel(wxPanel* panel, bool no_slice)
} }
} }
else { else {
preview->get_canvas3d()->enable_select_plate_toolbar(false); preview->get_canvas3d()->clear_select_plate_toolbar_render_flag();
} }
if (current_panel == panel) if (current_panel == panel)
@ -9453,6 +9461,7 @@ void Plater::force_update_all_plate_thumbnails()
invalid_all_plate_thumbnails(); invalid_all_plate_thumbnails();
update_all_plate_thumbnails(true); update_all_plate_thumbnails(true);
} }
get_preview_canvas3D()->clear_select_plate_toolbar_render_flag();
get_preview_canvas3D()->update_plate_thumbnails(); get_preview_canvas3D()->update_plate_thumbnails();
} }

2
src/slic3r/GUI/Plater.hpp
View File

@ -175,7 +175,7 @@ public:
std::vector<PlaterPresetComboBox*>& combos_filament(); std::vector<PlaterPresetComboBox*>& combos_filament();
Search::OptionsSearcher& get_searcher(); Search::OptionsSearcher& get_searcher();
std::string& get_search_line(); std::string& get_search_line();
void set_is_gcode_file(bool flag) { m_is_gcode_file = flag; } void set_is_gcode_file(bool flag);
void update_soft_first_start_state() { m_soft_first_start = false; } void update_soft_first_start_state() { m_soft_first_start = false; }
void cancel_update_3d_state() { m_update_3d_state = false; } void cancel_update_3d_state() { m_update_3d_state = false; }
bool get_update_3d_state() { return m_update_3d_state; } bool get_update_3d_state() { return m_update_3d_state; }