GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 19:35:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#8327 - Fixed gcode window disappearing when selecting volumetric speed in preview

Browse Source
This commit is contained in:
enricoturri1966 2022-05-16 14:29:33 +02:00
parent 15a082b80b
commit dc3cf1f7b8
2 changed files with 912 additions and 914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -386,14 +386,14 @@ void GCodeViewer::SequentialView::Marker::render()
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }
void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, std::vector<size_t> &&lines_ends) void GCodeViewer::SequentialView::GCodeWindow::load_gcode(const std::string& filename, const 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())
return; return;
m_filename = filename; m_filename = filename;
m_lines_ends = std::move(lines_ends); m_lines_ends = lines_ends;
m_selected_line_id = 0; m_selected_line_id = 0;
m_last_lines_size = 0; m_last_lines_size = 0;
@ -771,9 +771,7 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr
// release gpu memory, if used // release gpu memory, if used
reset(); reset();
m_sequential_view.gcode_window.load_gcode(gcode_result.filename, m_sequential_view.gcode_window.load_gcode(gcode_result.filename, gcode_result.lines_ends);
// 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 (wxGetApp().is_gcode_viewer()) if (wxGetApp().is_gcode_viewer())
m_custom_gcode_per_print_z = gcode_result.custom_gcode_per_print_z; m_custom_gcode_per_print_z = gcode_result.custom_gcode_per_print_z;

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

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