From 8c8256c6a23f159c9fb6e9f1c61c2689aa5d055e Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 14 Jan 2020 14:30:49 +0100 Subject: [PATCH] Fixed diameter/radius mismatch in gizmo UI --- src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 6 ++++-- src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 61f3c10b2..5a99949bf 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -822,14 +822,16 @@ RENDER_AGAIN: // m_imgui->text(" "); // vertical gap ImGui::Separator(); - float diameter_upper_cap = 20.f; //static_cast(wxGetApp().preset_bundle->sla_prints.get_edited_preset().config.option("support_pillar_diameter"))->value; + float diameter_upper_cap = 5.f; if (m_new_hole_radius > diameter_upper_cap) m_new_hole_radius = diameter_upper_cap; m_imgui->text(m_desc.at("hole_diameter")); ImGui::SameLine(diameter_slider_left); ImGui::PushItemWidth(window_width - diameter_slider_left); - ImGui::SliderFloat("", &m_new_hole_radius, 0.1f, diameter_upper_cap, "%.1f"); + float diam = 2.f * m_new_hole_radius; + ImGui::SliderFloat("", &diam, 1.f, diameter_upper_cap, "%.1f"); + m_new_hole_radius = diam / 2.f; bool clicked = ImGui::IsItemClicked(); bool edited = ImGui::IsItemEdited(); bool deactivated = ImGui::IsItemDeactivatedAfterEdit(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp index ba2935a56..b6a125972 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp @@ -58,7 +58,7 @@ private: bool unsaved_changes() const; bool m_show_supports = true; - float m_new_hole_radius = 4.f; // Size of a new hole. + float m_new_hole_radius = 2.f; // Size of a new hole. float m_new_hole_height = 5.f; mutable std::vector m_selected; // which holes are currently selected