3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed selection of object modified by gizmo

Browse Source
This commit is contained in:
Enrico Turri 2018-07-24 15:32:44 +02:00
parent d4adcd4077
commit d8f5daf345
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -2715,7 +2715,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
{ {
update_gizmos_data(); update_gizmos_data();
m_gizmos.start_dragging(); m_gizmos.start_dragging();
m_mouse.drag.gizmo_volume_idx = _get_first_selected_volume_id(); m_mouse.drag.gizmo_volume_idx = _get_first_selected_volume_id(selected_object_idx);
m_dirty = true; m_dirty = true;
} }
else else
@ -3736,32 +3736,17 @@ int GLCanvas3D::_get_first_selected_object_id() const
return -1; return -1;
} }
int GLCanvas3D::_get_first_selected_volume_id() const int GLCanvas3D::_get_first_selected_volume_id(int object_id) const
{ {
if (m_print != nullptr) int volume_id = -1;
{
int objects_count = (int)m_print->objects.size();
for (const GLVolume* vol : m_volumes.volumes) for (const GLVolume* vol : m_volumes.volumes)
{ {
if ((vol != nullptr) && vol->selected) ++volume_id;
{ if ((vol != nullptr) && vol->selected && (object_id == vol->select_group_id / 1000000))
int object_id = vol->select_group_id / 1000000; return volume_id;
// Objects with object_id >= 1000 have a specific meaning, for example the wipe tower proxy.
if ((object_id < 10000) && (object_id < objects_count))
{
int volume_id = 0;
for (int i = 0; i < object_id; ++i)
{
const PrintObject* obj = m_print->objects[i];
const ModelObject* model = obj->model_object();
volume_id += model->instances.size();
}
return volume_id;
}
}
}
} }
return -1; return -1;
} }

2
xs/src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -642,7 +642,7 @@ private:
void _stop_timer(); void _stop_timer();
int _get_first_selected_object_id() const; int _get_first_selected_object_id() const;
int _get_first_selected_volume_id() const; int _get_first_selected_volume_id(int object_id) const;
// Create 3D thick extrusion lines for a skirt and brim. // Create 3D thick extrusion lines for a skirt and brim.
// Adds a new Slic3r::GUI::3DScene::Volume to volumes. // Adds a new Slic3r::GUI::3DScene::Volume to volumes.