3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FIX: new imgui change input float

Browse source
This commit is contained in:
Filip Sykala 2021-07-19 09:50:45 +02:00
parent 86a3fd00a5
commit 709ea1283e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GUI_Factories.cpp
View file

@ -663,7 +663,7 @@ wxMenuItem* MenuFactory::append_menu_item_fix_through_netfabb(wxMenu* menu)
wxMenuItem* MenuFactory::append_menu_item_simplify(wxMenu* menu) wxMenuItem* MenuFactory::append_menu_item_simplify(wxMenu* menu)
{ {
wxMenuItem* menu_item = append_menu_item(menu, wxID_ANY, _L("Symplify model"), "", wxMenuItem* menu_item = append_menu_item(menu, wxID_ANY, _L("Simplify model"), "",
[](wxCommandEvent&) { obj_list()->simplify(); }, "", menu, [](wxCommandEvent&) { obj_list()->simplify(); }, "", menu,
[]() {return plater()->can_simplify(); }, plater()); []() {return plater()->can_simplify(); }, plater());
menu->AppendSeparator(); menu->AppendSeparator();

4
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View file

@ -92,7 +92,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
} }
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(80); ImGui::SetNextItemWidth(80);
int precision = (c.wanted_percent > 10)? 0: ((c.wanted_percent > 1)? 1:2); const char * precision = (c.wanted_percent > 10)? "%.0f": ((c.wanted_percent > 1)? "%.1f":"%.2f");
float step = (c.wanted_percent > 10)? 1.f: ((c.wanted_percent > 1)? 0.1f : 0.01f); float step = (c.wanted_percent > 10)? 1.f: ((c.wanted_percent > 1)? 0.1f : 0.01f);
if (ImGui::InputFloat("%", &c.wanted_percent, step, 10*step, precision)) { if (ImGui::InputFloat("%", &c.wanted_percent, step, 10*step, precision)) {
if (c.wanted_percent < 0.f) c.wanted_percent = 0.f; if (c.wanted_percent < 0.f) c.wanted_percent = 0.f;
@ -108,7 +108,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
} }
ImGui::SameLine(); ImGui::SameLine();
m_imgui->disabled_begin(!c.use_error); m_imgui->disabled_begin(!c.use_error);
if (ImGui::InputFloat("(maximal quadric error)", &c.max_error, 0.01f, .1f, 2)) { if (ImGui::InputFloat("(maximal quadric error)", &c.max_error, 0.01f, .1f, "%.2f")) {
if (c.max_error < 0.f) c.max_error = 0.f; if (c.max_error < 0.f) c.max_error = 0.f;
is_valid_result = false; is_valid_result = false;
} }