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

Fixed selection after layers deleting

Browse Source
This commit is contained in:
YuSanka 2019-06-17 13:09:11 +02:00
parent 7da9d2f66d
commit f394f84d51
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -2317,32 +2317,28 @@ void ObjectList::remove()
wxDataViewItemArray sels;
GetSelections(sels);
wxDataViewItem parent = wxDataViewItem(0);
for (auto& item : sels)
{
if (m_objects_model->GetParent(item) == wxDataViewItem(0))
delete_from_model_and_list(itObject, m_objects_model->GetIdByItem(item), -1);
else {
// if (sels.size() == 1)
// select_item(m_objects_model->GetParent(item));
wxDataViewItem parent = m_objects_model->GetParent(item);
if (sels.size() == 1) {
if (!(m_objects_model->GetItemType(item) & itLayer)) {
select_item(parent);
parent = wxDataViewItem(0);
}
else {
wxDataViewItemArray children;
if (m_objects_model->GetChildren(parent, children) == 1)
parent = m_objects_model->GetTopParent(item);
}
if (m_objects_model->GetItemType(item) & itLayer) {
parent = m_objects_model->GetParent(item);
wxDataViewItemArray children;
if (m_objects_model->GetChildren(parent, children) == 1)
parent = m_objects_model->GetTopParent(item);
}
else if (sels.size() == 1)
select_item(m_objects_model->GetParent(item));
del_subobject_item(item);
if (sels.size() == 1 && parent)
select_item(parent);
}
}
if (parent)
select_item(parent);
}
void ObjectList::del_layer_range(const t_layer_height_range& range)