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

Switched order of hollowing and support points gizmos

Browse source
This commit is contained in:
Lukas Matena 2020-01-07 14:52:04 +01:00
parent 578fcbc37c
commit ff065aa9ba
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View file

@ -85,13 +85,14 @@ bool GLGizmosManager::init()
m_common_gizmos_data.reset(new CommonGizmosData()); m_common_gizmos_data.reset(new CommonGizmosData());
// Order of gizmos in the vector must match order in EType!
m_gizmos.emplace_back(new GLGizmoMove3D(m_parent, "move.svg", 0)); m_gizmos.emplace_back(new GLGizmoMove3D(m_parent, "move.svg", 0));
m_gizmos.emplace_back(new GLGizmoScale3D(m_parent, "scale.svg", 1)); m_gizmos.emplace_back(new GLGizmoScale3D(m_parent, "scale.svg", 1));
m_gizmos.emplace_back(new GLGizmoRotate3D(m_parent, "rotate.svg", 2)); m_gizmos.emplace_back(new GLGizmoRotate3D(m_parent, "rotate.svg", 2));
m_gizmos.emplace_back(new GLGizmoFlatten(m_parent, "place.svg", 3)); m_gizmos.emplace_back(new GLGizmoFlatten(m_parent, "place.svg", 3));
m_gizmos.emplace_back(new GLGizmoCut(m_parent, "cut.svg", 4)); m_gizmos.emplace_back(new GLGizmoCut(m_parent, "cut.svg", 4));
m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", 5, m_common_gizmos_data.get())); m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", 5, m_common_gizmos_data.get()));
m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", 6, m_common_gizmos_data.get())); m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", 6, m_common_gizmos_data.get()));
for (auto& gizmo : m_gizmos) { for (auto& gizmo : m_gizmos) {
if (! gizmo->init()) { if (! gizmo->init()) {

3
src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
View file

@ -54,13 +54,14 @@ public:
enum EType : unsigned char enum EType : unsigned char
{ {
// Order must match index in m_gizmos!
Move, Move,
Scale, Scale,
Rotate, Rotate,
Flatten, Flatten,
Cut, Cut,
SlaSupports,
Hollow, Hollow,
SlaSupports,
Undefined Undefined
}; };