mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: Add buried points for cut and meshboolean 

JIRA: NONE

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541
This commit is contained in:
Kunlong Ma 2023-11-09 15:05:11 +08:00 committed by Lane.Wei
parent 82d5935a5e
commit 768fcd164d
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -6314,7 +6314,7 @@ bool GLCanvas3D::_init_assemble_view_toolbar()
if (m_canvas != nullptr) { 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(); 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(); 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; item.left.render_callback = GLToolbarItem::Default_Render_Callback;

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

@ -633,7 +633,7 @@ private:
int split_to_objects_count = 0; int split_to_objects_count = 0;
int split_to_part_count = 0; int split_to_part_count = 0;
int custom_height_count = 0; int custom_height_count = 0;
int custom_painting_count = 0; int assembly_view_count = 0;
public: public:
OrientSettings& get_orient_settings() OrientSettings& get_orient_settings()

6
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View File

@ -1700,12 +1700,18 @@ std::string get_name_from_gizmo_etype(GLGizmosManager::EType type)
return "Scale"; return "Scale";
case GLGizmosManager::EType::Flatten: case GLGizmosManager::EType::Flatten:
return "Flatten"; return "Flatten";
case GLGizmosManager::EType::Cut:
return "Cut";
case GLGizmosManager::EType::MeshBoolean:
return "MeshBoolean";
case GLGizmosManager::EType::FdmSupports: case GLGizmosManager::EType::FdmSupports:
return "FdmSupports"; return "FdmSupports";
case GLGizmosManager::EType::Seam: case GLGizmosManager::EType::Seam:
return "Seam"; return "Seam";
case GLGizmosManager::EType::Text: case GLGizmosManager::EType::Text:
return "Text"; return "Text";
case GLGizmosManager::EType::MmuSegmentation:
return "Color Painting";
default: default:
return ""; return "";
} }

15
src/slic3r/GUI/MainFrame.cpp
View File

@ -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); agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::Flatten), value);
j["flatten"] = value; j["flatten"] = value;
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); agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::FdmSupports), value);
j["custom_support"] = value; j["custom_support"] = value;
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); agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::Text), value);
j["text_shape"] = value; j["text_shape"] = value;
value = ""; value = "";
agent->track_get_property("custom_painting", value); agent->track_get_property(get_name_from_gizmo_etype(GLGizmosManager::EType::MmuSegmentation), value);
j["custom_painting"] = value; j["color_painting"] = value;
value = "";
agent->track_get_property("assembly_view", value);
j["assembly_view"] = value;
agent->track_event("key_func", j.dump()); agent->track_event("key_func", j.dump());
} }