amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed diameter/radius mismatch in gizmo UI

Browse source
This commit is contained in:
Lukas Matena 2020-01-14 14:30:49 +01:00
parent a3f3c868eb
commit 8c8256c6a2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
View file

@ -822,14 +822,16 @@ RENDER_AGAIN:
// m_imgui->text(" "); // vertical gap // m_imgui->text(" "); // vertical gap
ImGui::Separator(); ImGui::Separator();
float diameter_upper_cap = 20.f; //static_cast<ConfigOptionFloat*>(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) if (m_new_hole_radius > diameter_upper_cap)
m_new_hole_radius = diameter_upper_cap; m_new_hole_radius = diameter_upper_cap;
m_imgui->text(m_desc.at("hole_diameter")); m_imgui->text(m_desc.at("hole_diameter"));
ImGui::SameLine(diameter_slider_left); ImGui::SameLine(diameter_slider_left);
ImGui::PushItemWidth(window_width - 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 clicked = ImGui::IsItemClicked();
bool edited = ImGui::IsItemEdited(); bool edited = ImGui::IsItemEdited();
bool deactivated = ImGui::IsItemDeactivatedAfterEdit(); bool deactivated = ImGui::IsItemDeactivatedAfterEdit();

2
src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp
View file

@ -58,7 +58,7 @@ private:
bool unsaved_changes() const; bool unsaved_changes() const;
bool m_show_supports = true; 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; float m_new_hole_height = 5.f;
mutable std::vector<bool> m_selected; // which holes are currently selected mutable std::vector<bool> m_selected; // which holes are currently selected