3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactoring

Browse source
This commit is contained in:
enricoturri1966 2020-03-18 13:35:46 +01:00
parent 1c1a6b933a
commit 8a824bb8c2
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3778,7 +3778,7 @@ void GLCanvas3D::set_tooltip(const std::string& tooltip) const
if (m_canvas != nullptr) if (m_canvas != nullptr)
{ {
#if ENABLE_CANVAS_TOOLTIP_USING_IMGUI #if ENABLE_CANVAS_TOOLTIP_USING_IMGUI
m_tooltip.set_text(std::string((_(L(tooltip))).ToUTF8())); m_tooltip.set_text(tooltip);
#else #else
wxString txt = wxString::FromUTF8(tooltip.data()); wxString txt = wxString::FromUTF8(tooltip.data());
if (m_canvas->GetToolTipText() != txt) if (m_canvas->GetToolTipText() != txt)

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

@ -28,7 +28,7 @@ public:
double get_cut_z() const { return m_cut_z; } double get_cut_z() const { return m_cut_z; }
void set_cut_z(double cut_z) const; void set_cut_z(double cut_z) const;
virtual std::string get_tooltip() const; std::string get_tooltip() const override;
protected: protected:
virtual bool on_init(); virtual bool on_init();

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

@ -30,7 +30,7 @@ public:
const Vec3d& get_displacement() const { return m_displacement; } const Vec3d& get_displacement() const { return m_displacement; }
virtual std::string get_tooltip() const; std::string get_tooltip() const override;
protected: protected:
virtual bool on_init(); virtual bool on_init();

4
src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
View file

@ -49,7 +49,7 @@ public:
double get_angle() const { return m_angle; } double get_angle() const { return m_angle; }
void set_angle(double angle); void set_angle(double angle);
virtual std::string get_tooltip() const; std::string get_tooltip() const override;
protected: protected:
virtual bool on_init(); 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()); } 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)); } 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(); std::string tooltip = m_gizmos[X].get_tooltip();
if (tooltip.empty()) if (tooltip.empty())

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

@ -42,7 +42,7 @@ public:
const Vec3d& get_offset() const { return m_offset; } const Vec3d& get_offset() const { return m_offset; }
virtual std::string get_tooltip() const; std::string get_tooltip() const override;
protected: protected:
virtual bool on_init(); virtual bool on_init();