From 14aca210cb24e093fff0063a781b46075e6d3557 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 8 Mar 2021 10:20:07 +0100 Subject: [PATCH] Tech ENABLE_GCODE_WINDOW_USE_MAPPED_FILE merged into ENABLE_GCODE_WINDOW --- src/libslic3r/Technologies.hpp | 2 -- src/slic3r/GUI/GCodeViewer.cpp | 47 +--------------------------------- src/slic3r/GUI/GCodeViewer.hpp | 24 ++--------------- src/slic3r/GUI/GLCanvas3D.cpp | 19 -------------- src/slic3r/GUI/GLCanvas3D.hpp | 7 ----- src/slic3r/GUI/Plater.cpp | 14 ---------- 6 files changed, 3 insertions(+), 110 deletions(-) diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index a4c6aa214..63ee79805 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -55,8 +55,6 @@ #define ENABLE_VALIDATE_CUSTOM_GCODE (1 && ENABLE_2_3_1_ALPHA1) // Enable showing a imgui window containing gcode in preview #define ENABLE_GCODE_WINDOW (1 && ENABLE_2_3_1_ALPHA1) -// Enable using file mapping to show a imgui window containing gcode in preview -#define ENABLE_GCODE_WINDOW_USE_MAPPED_FILE (1 && ENABLE_GCODE_WINDOW) #endif // _prusaslicer_technologies_h_ diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 259f37899..7abcbdc41 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -303,9 +303,6 @@ void GCodeViewer::SequentialView::Marker::render() const #if ENABLE_GCODE_WINDOW void GCodeViewer::SequentialView::GCodeWindow::load_gcode() { -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - m_gcode.clear(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE if (m_filename.empty()) return; @@ -313,19 +310,13 @@ void GCodeViewer::SequentialView::GCodeWindow::load_gcode() { boost::nowide::ifstream f(m_filename); std::string line; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE // generate mapping for accessing data in file by line number uint64_t offset = 0; -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE while (std::getline(f, line)) { -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE size_t line_length = static_cast(line.length()); m_lines_map.push_back({ offset, line_length }); offset += static_cast(line_length) + 1; -#else - m_gcode.push_back(line); -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - } + } } catch (...) { @@ -337,7 +328,6 @@ void GCodeViewer::SequentialView::GCodeWindow::load_gcode() m_selected_line_id = 0; m_last_lines_size = 0; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE try { m_file.open(boost::filesystem::path(m_filename)); @@ -347,33 +337,16 @@ void GCodeViewer::SequentialView::GCodeWindow::load_gcode() BOOST_LOG_TRIVIAL(error) << "Unable to map file " << m_filename << ". Cannot show G-code window."; reset(); } -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE } -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -void GCodeViewer::SequentialView::GCodeWindow::start_mapping_file() -{ - std::cout << "GCodeViewer::SequentialView::GCodeWindow::start_mapping_file()\n"; -} - -void GCodeViewer::SequentialView::GCodeWindow::stop_mapping_file() -{ - std::cout << "GCodeViewer::SequentialView::GCodeWindow::stop_mapping_file()\n"; -} -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, uint64_t curr_line_id) const { auto update_lines = [this](uint64_t start_id, uint64_t end_id) { std::vector ret; ret.reserve(end_id - start_id + 1); for (uint64_t id = start_id; id <= end_id; ++id) { -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE // read line from file std::string gline(m_file.data() + m_lines_map[id - 1].first, m_lines_map[id - 1].second); -#else - const std::string& gline = m_gcode[id - 1]; -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE std::string command; std::string parameters; @@ -407,13 +380,8 @@ void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, u static const ImVec4 PARAMETERS_COLOR = { 1.0f, 1.0f, 1.0f, 1.0f }; static const ImVec4 COMMENT_COLOR = { 0.7f, 0.7f, 0.7f, 1.0f }; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE if (!m_visible || m_filename.empty() || m_lines_map.empty() || curr_line_id == 0) return; -#else - if (!m_visible || m_filename.empty() || m_gcode.empty() || curr_line_id == 0) - return; -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE // window height const float wnd_height = bottom - top; @@ -430,21 +398,13 @@ void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, u const uint64_t half_lines_count = lines_count / 2; uint64_t start_id = (curr_line_id >= half_lines_count) ? curr_line_id - half_lines_count : 0; uint64_t end_id = start_id + lines_count - 1; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE if (end_id >= static_cast(m_lines_map.size())) { end_id = static_cast(m_lines_map.size()) - 1; start_id = end_id - lines_count + 1; } -#else - if (end_id >= static_cast(m_gcode.size())) { - end_id = static_cast(m_gcode.size()) - 1; - start_id = end_id - lines_count + 1; - } -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE // updates list of lines to show, if needed if (m_selected_line_id != curr_line_id || m_last_lines_size != end_id - start_id + 1) { -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE try { *const_cast*>(&m_lines) = update_lines(start_id, end_id); @@ -454,9 +414,6 @@ void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, u BOOST_LOG_TRIVIAL(error) << "Error while loading from file " << m_filename << ". Cannot show G-code window."; return; } -#else - *const_cast*>(&m_lines) = update_lines(start_id, end_id); -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE *const_cast(&m_selected_line_id) = curr_line_id; *const_cast(&m_last_lines_size) = m_lines.size(); } @@ -531,13 +488,11 @@ void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, u ImGui::PopStyleVar(); } -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void GCodeViewer::SequentialView::GCodeWindow::stop_mapping_file() { if (m_file.is_open()) m_file.close(); } -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void GCodeViewer::SequentialView::render(float legend_height) const { diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index 890961a82..cc897c7bc 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -5,9 +5,9 @@ #include "libslic3r/GCode/GCodeProcessor.hpp" #include "GLModel.hpp" -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE +#if ENABLE_GCODE_WINDOW #include -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE +#endif // ENABLE_GCODE_WINDOW #include #include @@ -623,46 +623,30 @@ public: uint64_t m_selected_line_id{ 0 }; size_t m_last_lines_size{ 0 }; std::string m_filename; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE boost::iostreams::mapped_file_source m_file; // map for accessing data in file by line number std::vector> m_lines_map; -#else - std::vector m_gcode; -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE // current visible lines std::vector m_lines; public: -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE GCodeWindow() = default; ~GCodeWindow() { stop_mapping_file(); } -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void set_filename(const std::string& filename) { m_filename = filename; } void load_gcode(); -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - void start_mapping_file(); - void stop_mapping_file(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void reset() { stop_mapping_file(); m_lines_map.clear(); m_lines.clear(); m_filename.clear(); } -#else - void reset() { m_filename.clear(); } -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void toggle_visibility() { m_visible = !m_visible; } void render(float top, float bottom, uint64_t curr_line_id) const; -#if ENABLE_GCODE_WINDOW_USE_MAPPED_FILE private: void stop_mapping_file(); -#endif // ENABLE_GCODE_WINDOW_USE_MAPPED_FILE }; #endif // ENABLE_GCODE_WINDOW @@ -783,10 +767,6 @@ public: void export_toolpaths_to_obj(const char* filename) const; #if ENABLE_GCODE_WINDOW -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - void start_mapping_gcode_file() { m_sequential_view.gcode_window.start_mapping_file(); } - void stop_mapping_gcode_file() { m_sequential_view.gcode_window.stop_mapping_file(); } -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE void toggle_gcode_window_visibility() { m_sequential_view.gcode_window.toggle_visibility(); } #endif // ENABLE_GCODE_WINDOW diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 8f78e63e2..a77581535 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1195,11 +1195,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas) GLCanvas3D::~GLCanvas3D() { -#if ENABLE_GCODE_WINDOW -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - m_gcode_viewer.stop_mapping_gcode_file(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -#endif // ENABLE_GCODE_WINDOW reset_volumes(); } @@ -3900,20 +3895,6 @@ void GLCanvas3D::mouse_up_cleanup() m_canvas->ReleaseMouse(); } -#if ENABLE_GCODE_WINDOW -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -void GLCanvas3D::start_mapping_gcode_file() -{ - m_gcode_viewer.start_mapping_gcode_file(); -} - -void GLCanvas3D::stop_mapping_gcode_file() -{ - m_gcode_viewer.stop_mapping_gcode_file(); -} -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -#endif // ENABLE_GCODE_WINDOW - bool GLCanvas3D::_is_shown_on_screen() const { return (m_canvas != nullptr) ? m_canvas->IsShownOnScreen() : false; diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 27e8b49c7..10294931f 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -785,13 +785,6 @@ public: #endif } -#if ENABLE_GCODE_WINDOW -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - void start_mapping_gcode_file(); - void stop_mapping_gcode_file(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -#endif // ENABLE_GCODE_WINDOW - private: bool _is_shown_on_screen() const; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 67aae3f9b..7a38dd3a1 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3368,17 +3368,8 @@ void Plater::priv::set_current_panel(wxPanel* panel) panel_sizer->Layout(); if (current_panel == view3D) { -#if ENABLE_GCODE_WINDOW - if (old_panel == preview) { -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - preview->get_canvas3d()->stop_mapping_gcode_file(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - preview->get_canvas3d()->unbind_event_handlers(); - } -#else if (old_panel == preview) preview->get_canvas3d()->unbind_event_handlers(); -#endif // ENABLE_GCODE_WINDOW view3D->get_canvas3d()->bind_event_handlers(); @@ -3403,11 +3394,6 @@ void Plater::priv::set_current_panel(wxPanel* panel) view3D->get_canvas3d()->unbind_event_handlers(); preview->get_canvas3d()->bind_event_handlers(); -#if ENABLE_GCODE_WINDOW -#if !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE - preview->get_canvas3d()->start_mapping_gcode_file(); -#endif // !ENABLE_GCODE_WINDOW_USE_MAPPED_FILE -#endif // ENABLE_GCODE_WINDOW // see: Plater::priv::object_list_changed() // FIXME: it may be better to have a single function making this check and let it be called wherever needed