From fbf297819094958af2da1839dbdc8d59e6f4f795 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 10 Dec 2020 08:31:24 +0100 Subject: [PATCH] Fix of #5008 - Cut tool uses mm when object is converted to inches + Localization: Updated MO for PT_BR --- resources/localization/pt_br/PrusaSlicer.mo | Bin 281554 -> 281547 bytes src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 22 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/resources/localization/pt_br/PrusaSlicer.mo b/resources/localization/pt_br/PrusaSlicer.mo index e8621756eb820a2bba8eb61f4b7065837dca72b5..100d7262078e13fbb09382730a2f6d7bd05d21a5 100644 GIT binary patch delta 19307 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 o;YpqQ_UPK>^UmRUqedln@@-D;<& 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 diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 4c00f8f2f..7d878ffe0 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -13,6 +13,8 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GUI_ObjectManipulation.hpp" +#include "libslic3r/AppConfig.hpp" namespace Slic3r { @@ -33,7 +35,11 @@ GLGizmoCut::GLGizmoCut(GLCanvas3D& parent, const std::string& icon_filename, uns std::string GLGizmoCut::get_tooltip() const { - return (m_hover_id == 0 || m_grabbers[0].dragging) ? "Z: " + format(m_cut_z, 2) : ""; + double cut_z = m_cut_z; + if (wxGetApp().app_config->get("use_inches") == "1") + cut_z *= ObjectManipulation::mm_to_in; + + return (m_hover_id == 0 || m_grabbers[0].dragging) ? "Z: " + format(cut_z, 2) : ""; } bool GLGizmoCut::on_init() @@ -145,6 +151,8 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit) m_imgui->begin(_(L("Cut")), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); + bool imperial_units = wxGetApp().app_config->get("use_inches") == "1"; + // adjust window position to avoid overlap the view toolbar float win_h = ImGui::GetWindowHeight(); y = std::min(y, bottom_limit - win_h); @@ -163,7 +171,17 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit) m_imgui->text("Z"); ImGui::SameLine(); ImGui::PushItemWidth(m_imgui->get_style_scaling() * 150.0f); - ImGui::InputDouble("", &m_cut_z, 0.0f, 0.0f, "%.2f"); + + double cut_z = m_cut_z; + if (imperial_units) + cut_z *= ObjectManipulation::mm_to_in; + ImGui::InputDouble("", &cut_z, 0.0f, 0.0f, "%.2f"); + + ImGui::SameLine(); + m_imgui->text(imperial_units ? _L("in") : _L("mm")); + + if (imperial_units) + m_cut_z = cut_z * ObjectManipulation::in_to_mm; ImGui::Separator();