From 8a824bb8c2a74afd9610ed236f02cea97fa38ecb Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 18 Mar 2020 13:35:46 +0100 Subject: [PATCH] Refactoring --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoCut.hpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoMove.hpp | 2 +- src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp | 4 ++-- src/slic3r/GUI/Gizmos/GLGizmoScale.hpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index c2901ba2b..d6e892902 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3778,7 +3778,7 @@ void GLCanvas3D::set_tooltip(const std::string& tooltip) const if (m_canvas != nullptr) { #if ENABLE_CANVAS_TOOLTIP_USING_IMGUI - m_tooltip.set_text(std::string((_(L(tooltip))).ToUTF8())); + m_tooltip.set_text(tooltip); #else wxString txt = wxString::FromUTF8(tooltip.data()); if (m_canvas->GetToolTipText() != txt) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp index 633069089..c0f33978f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp @@ -28,7 +28,7 @@ public: double get_cut_z() const { return m_cut_z; } void set_cut_z(double cut_z) const; - virtual std::string get_tooltip() const; + std::string get_tooltip() const override; protected: virtual bool on_init(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp index d8de08200..5a4275b7f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp @@ -30,7 +30,7 @@ public: const Vec3d& get_displacement() const { return m_displacement; } - virtual std::string get_tooltip() const; + std::string get_tooltip() const override; protected: virtual bool on_init(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp index d666c324d..7365a20c3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp @@ -49,7 +49,7 @@ public: double get_angle() const { return m_angle; } void set_angle(double angle); - virtual std::string get_tooltip() const; + std::string get_tooltip() const override; protected: virtual bool on_init(); @@ -83,7 +83,7 @@ public: Vec3d get_rotation() const { return Vec3d(m_gizmos[X].get_angle(), m_gizmos[Y].get_angle(), m_gizmos[Z].get_angle()); } void set_rotation(const Vec3d& rotation) { m_gizmos[X].set_angle(rotation(0)); m_gizmos[Y].set_angle(rotation(1)); m_gizmos[Z].set_angle(rotation(2)); } - virtual std::string get_tooltip() const + std::string get_tooltip() const override { std::string tooltip = m_gizmos[X].get_tooltip(); if (tooltip.empty()) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp index 2a3348716..71f793279 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp @@ -42,7 +42,7 @@ public: const Vec3d& get_offset() const { return m_offset; } - virtual std::string get_tooltip() const; + std::string get_tooltip() const override; protected: virtual bool on_init();