From 4d61f1ced853c8189b0e692b649a8fd28ead9c87 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 24 Jan 2024 15:13:31 +0100 Subject: [PATCH] Removed obsolete debug code --- src/libvgcode/include/Types.hpp | 1 - src/libvgcode/include/Viewer.hpp | 7 ------- src/libvgcode/src/Viewer.cpp | 22 ---------------------- src/libvgcode/src/ViewerImpl.cpp | 9 --------- src/libvgcode/src/ViewerImpl.hpp | 16 ++++++---------- src/slic3r/GUI/GCodeViewer.cpp | 18 ------------------ 6 files changed, 6 insertions(+), 67 deletions(-) diff --git a/src/libvgcode/include/Types.hpp b/src/libvgcode/include/Types.hpp index 7d846769a0..38155cf457 100644 --- a/src/libvgcode/include/Types.hpp +++ b/src/libvgcode/include/Types.hpp @@ -6,7 +6,6 @@ #define VGCODE_TYPES_HPP #define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0 -#define VGCODE_ENABLE_DEBUG_CODE 0 #include #include diff --git a/src/libvgcode/include/Viewer.hpp b/src/libvgcode/include/Viewer.hpp index 6f9b57e8c4..0e3f1f1d52 100644 --- a/src/libvgcode/include/Viewer.hpp +++ b/src/libvgcode/include/Viewer.hpp @@ -360,13 +360,6 @@ public: // size_t get_used_gpu_memory() const; -#if VGCODE_ENABLE_DEBUG_CODE - size_t get_enabled_segments_count() const; - const Interval& get_enabled_segments_range() const; - size_t get_enabled_options_count() const; - const Interval& get_enabled_options_range() const; -#endif // VGCODE_ENABLE_DEBUG_CODE - #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS // // Returns the position of the center of gravity of the toolpaths. diff --git a/src/libvgcode/src/Viewer.cpp b/src/libvgcode/src/Viewer.cpp index 1dfc43ef2b..51b8646310 100644 --- a/src/libvgcode/src/Viewer.cpp +++ b/src/libvgcode/src/Viewer.cpp @@ -347,28 +347,6 @@ size_t Viewer::get_used_gpu_memory() const return m_impl->get_used_gpu_memory(); } -#if VGCODE_ENABLE_DEBUG_CODE -size_t Viewer::get_enabled_segments_count() const -{ - return m_impl->get_enabled_segments_count(); -} - -const Interval& Viewer::get_enabled_segments_range() const -{ - return m_impl->get_enabled_segments_range(); -} - -size_t Viewer::get_enabled_options_count() const -{ - return m_impl->get_enabled_options_count(); -} - -const Interval& Viewer::get_enabled_options_range() const -{ - return m_impl->get_enabled_options_range(); -} -#endif // VGCODE_ENABLE_DEBUG_CODE - #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS Vec3 Viewer::get_cog_position() const { diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index 965308ce20..9d2f002630 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -687,15 +687,6 @@ void ViewerImpl::update_enabled_entities() m_enabled_segments_count = enabled_segments.size(); m_enabled_options_count = enabled_options.size(); - if (m_enabled_segments_count > 0) - m_enabled_segments_range.set(enabled_segments.front(), enabled_segments.back()); - else - m_enabled_segments_range.reset(); - if (m_enabled_options_count > 0) - m_enabled_options_range.set(enabled_options.front(), enabled_options.back()); - else - m_enabled_options_range.reset(); - m_enabled_segments_tex_size = enabled_segments.size() * sizeof(uint32_t); m_enabled_options_tex_size = enabled_options.size() * sizeof(uint32_t); diff --git a/src/libvgcode/src/ViewerImpl.hpp b/src/libvgcode/src/ViewerImpl.hpp index 8c23208d0f..51c3739a7f 100644 --- a/src/libvgcode/src/ViewerImpl.hpp +++ b/src/libvgcode/src/ViewerImpl.hpp @@ -121,14 +121,6 @@ public: float get_estimated_time_at(size_t id) const; Color get_vertex_color(const PathVertex& vertex) const; -#if VGCODE_ENABLE_DEBUG_CODE - size_t get_enabled_segments_count() const { return m_enabled_segments_count; } - const Interval& get_enabled_segments_range() const { return m_enabled_segments_range.get(); } - - size_t get_enabled_options_count() const { return m_enabled_options_count; } - const Interval& get_enabled_options_range() const { return m_enabled_options_range.get(); } -#endif // VGCODE_ENABLE_DEBUG_CODE - size_t get_extrusion_roles_count() const { return m_extrusion_roles.get_roles_count(); } std::vector get_extrusion_roles() const { return m_extrusion_roles.get_roles(); } float get_extrusion_role_time(EGCodeExtrusionRole role) const { return m_extrusion_roles.get_time(role, m_settings.time_mode); } @@ -264,13 +256,17 @@ private: // cpu buffer to store vertices // std::vector m_vertices; - Range m_enabled_segments_range; - Range m_enabled_options_range; // // Variables used for toolpaths visibiliity // BitSet<> m_valid_lines_bitset; + // + // Count of enabled segments + // size_t m_enabled_segments_count{ 0 }; + // + // Count of enabled options + // size_t m_enabled_options_count{ 0 }; // // Variables used for toolpaths coloring diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index a6bf493fcf..0090a872e6 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3862,24 +3862,6 @@ void GCodeViewer::render_toolpaths() ImGui::TableSetColumnIndex(1); imgui.text(std::to_string(m_viewer.get_vertices_count())); -#if VGCODE_ENABLE_DEBUG_CODE - ImGui::TableNextRow(); - ImGui::TableSetColumnIndex(0); - imgui.text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, "# enabled lines"); - ImGui::TableSetColumnIndex(1); - const libvgcode::Interval& enabled_segments_range = m_viewer.get_enabled_segments_range(); - imgui.text(std::to_string(m_viewer.get_enabled_segments_count()) + " [" + std::to_string(enabled_segments_range[0]) + - "-" + std::to_string(enabled_segments_range[1]) + "]"); - - ImGui::TableNextRow(); - ImGui::TableSetColumnIndex(0); - imgui.text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, "# enabled options"); - ImGui::TableSetColumnIndex(1); - const libvgcode::Interval& enabled_options_range = m_viewer.get_enabled_options_range(); - imgui.text(std::to_string(m_viewer.get_enabled_options_count()) + " [" + std::to_string(enabled_options_range[0]) + - "-" + std::to_string(enabled_options_range[1]) + "]"); -#endif // VGCODE_ENABLE_DEBUG_CODE - ImGui::Separator(); ImGui::TableNextRow();