3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

GCodeViewer slight opitmization: reuse (move) G-code line indices

Browse source 
in G-code viewer.
This commit is contained in:
Vojtech Bubnik 2021-09-13 10:41:21 +02:00
parent 5a95794913
commit 880feb3a3d
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -284,7 +284,7 @@ void GCodeViewer::SequentialView::Marker::render() const
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }
void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, const std::vector<size_t> &lines_ends) void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, std::vector<size_t> &&lines_ends)
{ {
assert(! m_file.is_open()); assert(! m_file.is_open());
if (m_file.is_open()) if (m_file.is_open())
@ -577,7 +577,9 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print&
// release gpu memory, if used // release gpu memory, if used
reset(); reset();
m_sequential_view.gcode_window.load_gcode(gcode_result.filename, gcode_result.lines_ends); m_sequential_view.gcode_window.load_gcode(gcode_result.filename,
// Stealing out lines_ends should be safe because this gcode_result is processed only once (see the 1st if in this function).
std::move(const_cast<std::vector<size_t>&>(gcode_result.lines_ends)));
#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER #if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
if (wxGetApp().is_gcode_viewer()) if (wxGetApp().is_gcode_viewer())

2
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -702,7 +702,7 @@ public:
public: public:
GCodeWindow() = default; GCodeWindow() = default;
~GCodeWindow() { stop_mapping_file(); } ~GCodeWindow() { stop_mapping_file(); }
void load_gcode(const std::string& filename, const std::vector<size_t> &lines_ends); void load_gcode(const std::string& filename, std::vector<size_t> &&lines_ends);
void reset() { void reset() {
stop_mapping_file(); stop_mapping_file();
m_lines_ends.clear(); m_lines_ends.clear();

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

@ -2092,7 +2092,7 @@ static void reserve_new_volume_finalize_old_volume(GLVolume& vol_new, GLVolume&
vol_old.finalize_geometry(gl_initialized); vol_old.finalize_geometry(gl_initialized);
} }
void GLCanvas3D::load_gcode_preview(const GCodeProcessor::Result& gcode_result) void GLCanvas3D::load_gcode_preview(const GCodeProcessor::Result& gcode_result, const std::vector<std::string>& str_tool_colors)
{ {
m_gcode_viewer.load(gcode_result, *this->fff_print(), m_initialized); m_gcode_viewer.load(gcode_result, *this->fff_print(), m_initialized);
@ -2100,10 +2100,7 @@ void GLCanvas3D::load_gcode_preview(const GCodeProcessor::Result& gcode_result)
m_gcode_viewer.update_shells_color_by_extruder(m_config); m_gcode_viewer.update_shells_color_by_extruder(m_config);
_set_warning_notification_if_needed(EWarning::ToolpathOutside); _set_warning_notification_if_needed(EWarning::ToolpathOutside);
} }
}
void GLCanvas3D::refresh_gcode_preview(const GCodeProcessor::Result& gcode_result, const std::vector<std::string>& str_tool_colors)
{
m_gcode_viewer.refresh(gcode_result, str_tool_colors); m_gcode_viewer.refresh(gcode_result, str_tool_colors);
set_as_dirty(); set_as_dirty();
request_extra_frame(); request_extra_frame();

3
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -722,8 +722,7 @@ public:
void reload_scene(bool refresh_immediately, bool force_full_scene_refresh = false); void reload_scene(bool refresh_immediately, bool force_full_scene_refresh = false);
void load_gcode_preview(const GCodeProcessor::Result& gcode_result); void load_gcode_preview(const GCodeProcessor::Result& gcode_result, const std::vector<std::string>& str_tool_colors);
void refresh_gcode_preview(const GCodeProcessor::Result& gcode_result, const std::vector<std::string>& str_tool_colors);
void refresh_gcode_preview_render_paths(); void refresh_gcode_preview_render_paths();
void set_gcode_view_preview_type(GCodeViewer::EViewType type) { return m_gcode_viewer.set_view_type(type); } void set_gcode_view_preview_type(GCodeViewer::EViewType type) { return m_gcode_viewer.set_view_type(type); }
GCodeViewer::EViewType get_gcode_view_preview_type() const { return m_gcode_viewer.get_view_type(); } GCodeViewer::EViewType get_gcode_view_preview_type() const { return m_gcode_viewer.get_view_type(); }

3
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -943,8 +943,7 @@ void Preview::load_print_as_fff(bool keep_z_range)
m_canvas->set_selected_extruder(0); m_canvas->set_selected_extruder(0);
if (gcode_preview_data_valid) { if (gcode_preview_data_valid) {
// Load the real G-code preview. // Load the real G-code preview.
m_canvas->load_gcode_preview(*m_gcode_result); m_canvas->load_gcode_preview(*m_gcode_result, colors);
m_canvas->refresh_gcode_preview(*m_gcode_result, colors);
m_left_sizer->Show(m_bottom_toolbar_panel); m_left_sizer->Show(m_bottom_toolbar_panel);
m_left_sizer->Layout(); m_left_sizer->Layout();
Refresh(); Refresh();