3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native

Browse source
This commit is contained in:
bubnikv 2018-10-24 14:45:50 +02:00
commit 540a94b36d
3 changed files with 13 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/GLGizmo.cpp
View file

@ -445,10 +445,22 @@ void GLGizmoRotate::on_render(const BoundingBoxf3& box) const
#if ENABLE_EXTENDED_SELECTION
const BoundingBoxf3& box = selection.get_bounding_box();
#endif // ENABLE_EXTENDED_SELECTION
bool single_instance = selection.is_single_full_instance();
std::string axis;
switch (m_axis)
{
case X: { axis = "X: "; break; }
case Y: { axis = "Y: "; break; }
case Z: { axis = "Z: "; break; }
}
if ((single_instance && (m_hover_id == 0)) || m_dragging)
set_tooltip(axis + format((float)Geometry::rad2deg(m_angle), 4) + "°");
#else
if (m_dragging)
set_tooltip(format(m_angle * 180.0f / (float)PI, 4));
#endif // ENABLE_EXTENDED_SELECTION
else
{
m_center = box.center();