GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-04 23:10:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

QoL: Some UI improvements to Cut Gizmo (#3752)

Browse Source 
* Cut: Add color legend for upper & lower part

* Cut: Make grabber larger
This commit is contained in:
Noisyfox 2024-01-21 22:15:03 +08:00 committed by GitHub
parent 122c5cedd8
commit 606438d61a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -717,7 +717,12 @@ bool GLGizmoCut3D::render_reset_button(const std::string& label_id, const std::s
static double get_grabber_mean_size(const BoundingBoxf3& bb) static double get_grabber_mean_size(const BoundingBoxf3& bb)
{ {
#if ENABLE_FIXED_GRABBER
// Orca: make grabber larger
return 32. * GLGizmoBase::INV_ZOOM;
#else
return (bb.size().x() + bb.size().y() + bb.size().z()) / 30.; return (bb.size().x() + bb.size().y() + bb.size().z()) / 30.;
#endif
} }
indexed_triangle_set GLGizmoCut3D::its_make_groove_plane() indexed_triangle_set GLGizmoCut3D::its_make_groove_plane()
@ -2503,13 +2508,13 @@ void GLGizmoCut3D::add_horizontal_shift(float shift)
void GLGizmoCut3D::render_color_marker(float size, const ImU32& color) void GLGizmoCut3D::render_color_marker(float size, const ImU32& color)
{ {
ImGui::SameLine();
const float radius = 0.5f * size; const float radius = 0.5f * size;
ImVec2 pos = ImGui::GetCurrentWindow()->DC.CursorPos; ImVec2 pos = ImGui::GetCurrentWindow()->DC.CursorPos;
pos.x += size; pos.x += radius;
pos.y += 1.25f * radius; pos.y += 1.4f * radius;
ImGui::GetCurrentWindow()->DrawList->AddNgonFilled(pos, radius, color, 6); ImGui::GetCurrentWindow()->DrawList->AddNgonFilled(pos, radius, color, 6);
m_imgui->text(" "); m_imgui->text(" ");
ImGui::SameLine();
} }
void GLGizmoCut3D::render_groove_float_input(const std::string& label, float& in_val, const float& init_val, float& in_tolerance) void GLGizmoCut3D::render_groove_float_input(const std::string& label, float& in_val, const float& init_val, float& in_tolerance)
@ -2730,20 +2735,27 @@ void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors, floa
// render "After Cut" section // render "After Cut" section
float label_width = 0; ImVec2 label_size;
for (const wxString &label : {_L("Upper part"), _L("Lower part")}) { for (const wxString &label : {_L("Upper part"), _L("Lower part")}) {
const float width = m_imgui->calc_text_size(label).x + m_imgui->scaled(1.5f); const ImVec2 text_size = ImGuiWrapper::calc_text_size(label);
if (label_width < width) if (label_size.x < text_size.x)
label_width = width; label_size.x = text_size.x;
if (label_size.y < text_size.y)
label_size.y = text_size.y;
} }
auto render_part_action_line = [this, label_width, &connectors](const wxString &label, const wxString &suffix, bool &keep_part, const float marker_size = label_size.y;
const float h_shift = marker_size + label_size.x + m_imgui->scaled(2.f);
auto render_part_action_line = [this, h_shift, marker_size, &connectors](const wxString &label, const wxString &suffix, bool &keep_part,
bool &place_on_cut_part, bool &rotate_part) { bool &place_on_cut_part, bool &rotate_part) {
bool keep = true; bool keep = true;
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
render_color_marker(marker_size, ImGuiWrapper::to_ImU32(suffix == "##upper" ? UPPER_PART_COLOR : LOWER_PART_COLOR));
m_imgui->text(label); m_imgui->text(label);
ImGui::SameLine(label_width); ImGui::SameLine(h_shift);
m_imgui->disabled_begin(!connectors.empty() || m_keep_as_parts); m_imgui->disabled_begin(!connectors.empty() || m_keep_as_parts);
m_imgui->bbl_checkbox(_L("Keep") + suffix, connectors.empty() ? keep_part : keep); m_imgui->bbl_checkbox(_L("Keep") + suffix, connectors.empty() ? keep_part : keep);