juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix sub_menu work(on the Scene) under OSX and Linux

Browse Source 
+ some code refactoring for context menu inside ObjectList
This commit is contained in:
YuSanka
2018-12-06 14:49:14 +01:00
parent 79986188a7
commit e382692a3f
5 changed files with 130 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/Plater.cpp
View File

@@ -973,6 +973,7 @@ struct Plater::priv
const GLCanvas3D::Selection& get_selection() const;
GLCanvas3D::Selection& get_selection();
int get_selected_object_idx() const;
int get_selected_volume_idx() const;
void selection_changed();
void object_list_changed();
@@ -1624,6 +1625,18 @@ int Plater::priv::get_selected_object_idx() const
return ((0 <= idx) && (idx < 1000)) ? idx : -1;
}
int Plater::priv::get_selected_volume_idx() const
{
auto& selection = get_selection();
int idx = selection.get_object_idx();
if ((0 > idx) || (idx > 1000))
return-1;
const GLVolume* v = selection.get_volume(*selection.get_volume_idxs().begin());
if (model.objects[idx]->volumes.size() > 1)
return v->volume_idx();
return -1;
}
void Plater::priv::selection_changed()
{
#if ENABLE_REMOVE_TABS_FROM_PLATER
@@ -1936,7 +1949,7 @@ void Plater::priv::split_object()
void Plater::priv::split_volume()
{
wxGetApp().obj_list()->split(false);
wxGetApp().obj_list()->split();
}
void Plater::priv::schedule_background_process()