From 768fcd164d71aad28824f450b5edc3a12acef99b Mon Sep 17 00:00:00 2001 From: Kunlong Ma Date: Thu, 9 Nov 2023 15:05:11 +0800 Subject: [PATCH] ENH: Add buried points for cut and meshboolean JIRA: NONE Signed-off-by: Kunlong Ma Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541 --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/GLCanvas3D.hpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 6 ++++++ src/slic3r/GUI/MainFrame.cpp | 15 +++++++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 8d151561a..9b5927ad4 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -6314,7 +6314,7 @@ bool GLCanvas3D::_init_assemble_view_toolbar() if (m_canvas != nullptr) { wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_ASSEMBLE)); m_gizmos.reset_all_states(); wxGetApp().plater()->get_assmeble_canvas3D()->get_gizmos_manager().reset_all_states(); NetworkAgent* agent = GUI::wxGetApp().getAgent(); - if (agent) agent->track_update_property("custom_painting", std::to_string(++custom_painting_count)); + if (agent) agent->track_update_property("assembly_view", std::to_string(++assembly_view_count)); } }; item.left.render_callback = GLToolbarItem::Default_Render_Callback; diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 074a4906e..b8cb4f49a 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -633,7 +633,7 @@ private: int split_to_objects_count = 0; int split_to_part_count = 0; int custom_height_count = 0; - int custom_painting_count = 0; + int assembly_view_count = 0; public: OrientSettings& get_orient_settings() diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index d6b7ce0a3..5c40657dd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -1700,12 +1700,18 @@ std::string get_name_from_gizmo_etype(GLGizmosManager::EType type) return "Scale"; case GLGizmosManager::EType::Flatten: return "Flatten"; + case GLGizmosManager::EType::Cut: + return "Cut"; + case GLGizmosManager::EType::MeshBoolean: + return "MeshBoolean"; case GLGizmosManager::EType::FdmSupports: return "FdmSupports"; case GLGizmosManager::EType::Seam: return "Seam"; case GLGizmosManager::EType::Text: return "Text"; + case GLGizmosManager::EType::MmuSegmentation: + return "Color Painting"; default: return ""; } diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 7ccbcab86..9e1596f11 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -505,6 +505,12 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::Flatten), value); j["flatten"] = value; value = ""; + agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::Cut), value); + j["cut"] = value; + value = ""; + agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::MeshBoolean), value); + j["meshboolean"] = value; + value = ""; agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::FdmSupports), value); j["custom_support"] = value; value = ""; @@ -514,8 +520,13 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::Text), value); j["text_shape"] = value; value = ""; - agent->track_get_property("custom_painting", value); - j["custom_painting"] = value; + agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::MmuSegmentation), value); + j["color_painting"] = value; + value = ""; + + agent->track_get_property("assembly_view", value); + j["assembly_view"] = value; + agent->track_event("key_func", j.dump()); }