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

ENH:identify Upper/Lower parts for cut tool 

Jira:STUDIO-4227
most of code from PrusaSlcer,thanks for PrusaSlcer and YuSanka
commit b40473be51fd1050fa4d7b2c3297230758085d46
Author: YuSanka <yusanka@gmail.com>
Date:   Thu Feb 9 08:52:07 2023 +0100
    CutGizmo: Improvements to identify Upper/Lower parts_count

Change-Id: I36cd64ec0a6ede696d22b854146fa3cdfd87ad91
This commit is contained in:
Oleksandra Yushchenko 2023-09-26 16:47:02 +08:00 committed by Lane.Wei
parent 74c64229b4
commit 771f8e6aad
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View File

@ -1764,6 +1764,16 @@ bool GLGizmoAdvancedCut::render_cut_mode_combo(double label_width)
return is_changed;
}
void GLGizmoAdvancedCut::render_color_marker(float size, const ColorRGBA &color)
{
auto to_ImU32 = [](const ColorRGBA &color) -> ImU32 { return ImGui::GetColorU32({color[0], color[1], color[1], color[2]}); };
ImGui::SameLine();
const float radius = 0.5f * size;
ImVec2 pos = ImGui::GetCurrentWindow()->DC.CursorPos;
pos.y += 1.7f * radius;
ImGui::GetCurrentWindow()->DrawList->AddNgonFilled(pos, radius, to_ImU32(color), 6);
}
void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float bottom_limit)
{
// float unit_size = m_imgui->get_style_scaling() * 48.0f;
@ -1931,8 +1941,10 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
auto render_part_action_line = [this, label_width, &connectors](const wxString &label, const wxString &suffix, bool &keep_part, bool &place_on_cut_part, bool &rotate_part) {
bool keep = true;
ImGui::AlignTextToFramePadding();
m_imgui->text(label);
m_imgui->text(m_cut_to_parts ? _L("Part") : _L("Object") +label);
float marker_size = 12;
render_color_marker(marker_size, suffix == "##upper" ? UPPER_PART_COLOR : LOWER_PART_COLOR);
ImGui::SameLine(label_width);
m_imgui->disabled_begin(!keep_part || m_cut_to_parts);
@ -1955,8 +1967,8 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
};
m_imgui->text(_L("After cut") + ": ");
render_part_action_line( _L("Upper part"), "##upper", m_keep_upper, m_place_on_cut_upper, m_rotate_upper);
render_part_action_line( _L("Lower part"), "##lower", m_keep_lower, m_place_on_cut_lower, m_rotate_lower);
render_part_action_line( _L("A"), "##upper", m_keep_upper, m_place_on_cut_upper, m_rotate_upper);
render_part_action_line( _L("B"), "##lower", m_keep_lower, m_place_on_cut_lower, m_rotate_lower);
m_imgui->disabled_begin(has_connectors || m_cut_mode == CutMode::cutTongueAndGroove);
m_imgui->bbl_checkbox(_L("Cut to parts"), m_cut_to_parts);

1
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp
View File

@ -322,6 +322,7 @@ private:
Transform3d get_cut_matrix(const Selection &selection);
// render input window
bool render_cut_mode_combo(double label_width);
void render_color_marker(float size, const ColorRGBA &color);
void render_cut_plane_input_window(float x, float y, float bottom_limit);
void init_connectors_input_window_data();
void render_connectors_input_window(float x, float y, float bottom_limit);