GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-21 03:03:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH:enhance warning text of boolean operation

Browse Source 
Jira: STUDIO-5755
Change-Id: I04dd21f3412c1452d67c9ba557145254000060d7
This commit is contained in:
zhou.xu 2024-01-02 10:07:55 +08:00 committed by Lane.Wei
parent 62b872888f
commit 044919252b
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
View File

@ -14,7 +14,8 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
static const std::string warning_text = _u8L("Unable to perform boolean operation on selected parts"); static const std::string warning_text_common = _u8L("Unable to perform boolean operation on selected parts");
static const std::string warning_text_intersection = _u8L("Performed boolean intersection fails \n because the selected parts have no intersection");
GLGizmoMeshBoolean::GLGizmoMeshBoolean(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) GLGizmoMeshBoolean::GLGizmoMeshBoolean(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
: GLGizmoBase(parent, icon_filename, sprite_id) : GLGizmoBase(parent, icon_filename, sprite_id)
@ -139,6 +140,7 @@ void GLGizmoMeshBoolean::on_render()
void GLGizmoMeshBoolean::on_set_state() void GLGizmoMeshBoolean::on_set_state()
{ {
m_warning_text = "";
if (m_state == EState::On) { if (m_state == EState::On) {
m_src.reset(); m_src.reset();
m_tool.reset(); m_tool.reset();
@ -154,7 +156,6 @@ void GLGizmoMeshBoolean::on_set_state()
bool m_inter_delete_input = false; bool m_inter_delete_input = false;
m_operation_mode = MeshBooleanOperation::Undef; m_operation_mode = MeshBooleanOperation::Undef;
m_selecting_state = MeshBooleanSelectingState::Undef; m_selecting_state = MeshBooleanSelectingState::Undef;
wxGetApp().notification_manager()->close_plater_warning_notification(warning_text);
} }
} }
@ -321,10 +322,10 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "UNION"); Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "UNION");
if (temp_mesh_resuls.size() != 0) { if (temp_mesh_resuls.size() != 0) {
generate_new_volume(true, *temp_mesh_resuls.begin()); generate_new_volume(true, *temp_mesh_resuls.begin());
wxGetApp().notification_manager()->close_plater_warning_notification(warning_text); m_warning_text = "";
} }
else { else {
wxGetApp().notification_manager()->push_plater_warning_notification(warning_text); m_warning_text = warning_text_common;
} }
} }
} }
@ -339,10 +340,10 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "A_NOT_B"); Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "A_NOT_B");
if (temp_mesh_resuls.size() != 0) { if (temp_mesh_resuls.size() != 0) {
generate_new_volume(m_diff_delete_input, *temp_mesh_resuls.begin()); generate_new_volume(m_diff_delete_input, *temp_mesh_resuls.begin());
wxGetApp().notification_manager()->close_plater_warning_notification(warning_text); m_warning_text = "";
} }
else { else {
wxGetApp().notification_manager()->push_plater_warning_notification(warning_text); m_warning_text = warning_text_common;
} }
} }
} }
@ -357,13 +358,14 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "INTERSECTION"); Slic3r::MeshBoolean::mcut::make_boolean(temp_src_mesh, temp_tool_mesh, temp_mesh_resuls, "INTERSECTION");
if (temp_mesh_resuls.size() != 0) { if (temp_mesh_resuls.size() != 0) {
generate_new_volume(m_inter_delete_input, *temp_mesh_resuls.begin()); generate_new_volume(m_inter_delete_input, *temp_mesh_resuls.begin());
wxGetApp().notification_manager()->close_plater_warning_notification(warning_text); m_warning_text = "";
} }
else { else {
wxGetApp().notification_manager()->push_plater_warning_notification(warning_text); m_warning_text = warning_text_intersection;
} }
} }
} }
render_input_window_warning(m_warning_text);
float win_w = ImGui::GetWindowWidth(); float win_w = ImGui::GetWindowWidth();
if (last_w != win_w || last_y != y) { if (last_w != win_w || last_y != y) {
@ -381,6 +383,12 @@ void GLGizmoMeshBoolean::on_render_input_window(float x, float y, float bottom_l
ImGuiWrapper::pop_toolbar_style(); ImGuiWrapper::pop_toolbar_style();
} }
void GLGizmoMeshBoolean::render_input_window_warning(const std::string &text) {
if (text.size() > 0) {
m_imgui->text(_L("Warning") + ": " + _L(text));
}
}
void GLGizmoMeshBoolean::on_load(cereal::BinaryInputArchive &ar) void GLGizmoMeshBoolean::on_load(cereal::BinaryInputArchive &ar)
{ {
ar(m_enable, m_operation_mode, m_selecting_state, m_diff_delete_input, m_inter_delete_input, m_src, m_tool); ar(m_enable, m_operation_mode, m_selecting_state, m_diff_delete_input, m_inter_delete_input, m_src, m_tool);

3
src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp
View File

@ -67,7 +67,7 @@ protected:
virtual void on_set_state() override; virtual void on_set_state() override;
virtual CommonGizmosDataID on_get_requirements() const override; virtual CommonGizmosDataID on_get_requirements() const override;
virtual void on_render_input_window(float x, float y, float bottom_limit); virtual void on_render_input_window(float x, float y, float bottom_limit);
virtual void render_input_window_warning(const std::string &text);
void on_load(cereal::BinaryInputArchive &ar) override; void on_load(cereal::BinaryInputArchive &ar) override;
void on_save(cereal::BinaryOutputArchive &ar) const override; void on_save(cereal::BinaryOutputArchive &ar) const override;
@ -77,6 +77,7 @@ private:
MeshBooleanSelectingState m_selecting_state; MeshBooleanSelectingState m_selecting_state;
bool m_diff_delete_input = false; bool m_diff_delete_input = false;
bool m_inter_delete_input = false; bool m_inter_delete_input = false;
std::string m_warning_text;
VolumeInfo m_src; VolumeInfo m_src;
VolumeInfo m_tool; VolumeInfo m_tool;