3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
Enrico Turri 2019-04-03 15:28:27 +02:00
commit 305b07978c
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
View file

@ -330,8 +330,12 @@ bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
m_canvas_width = m_parent.get_canvas_size().get_width(); m_canvas_width = m_parent.get_canvas_size().get_width();
m_canvas_height = m_parent.get_canvas_size().get_height(); m_canvas_height = m_parent.get_canvas_size().get_height();
} }
else {
if (m_editing_mode_cache[m_hover_id].selected)
unselect_point(m_hover_id);
else else
select_point(m_hover_id); select_point(m_hover_id);
}
return true; return true;
} }
@ -791,6 +795,19 @@ void GLGizmoSlaSupports::select_point(int i)
} }
void GLGizmoSlaSupports::unselect_point(int i)
{
m_editing_mode_cache[i].selected = false;
m_selection_empty = true;
for (const CacheEntry& ce : m_editing_mode_cache) {
if (ce.selected) {
m_selection_empty = false;
break;
}
}
}
void GLGizmoSlaSupports::editing_mode_discard_changes() void GLGizmoSlaSupports::editing_mode_discard_changes()
{ {

1
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
View file

@ -93,6 +93,7 @@ private:
NoPoints, NoPoints,
}; };
void select_point(int i); void select_point(int i);
void unselect_point(int i);
void editing_mode_apply_changes(); void editing_mode_apply_changes();
void editing_mode_discard_changes(); void editing_mode_discard_changes();
void editing_mode_reload_cache(); void editing_mode_reload_cache();