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

Added correct deleting of the selected objects(parts, mix)

Browse Source 
but only in "ObjectList->Scene" direction
This commit is contained in:
YuSanka
2018-10-12 12:00:37 +02:00
parent 0bc99f3f65
commit b7980f6b9b
7 changed files with 88 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/wxExtensions.cpp
View File

@@ -591,7 +591,8 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemByVolumeId(int obj_idx, int volu
}
auto parent = m_objects[obj_idx];
if (parent->GetChildCount() == 0) {
if (parent->GetChildCount() == 0 ||
(parent->GetChildCount() == 1 && parent->GetNthChild(0)->m_volume_id == -2)) {
if (volume_idx == 0)
return GetItemById(obj_idx);
@@ -628,6 +629,23 @@ int PrusaObjectDataViewModel::GetVolumeIdByItem(const wxDataViewItem& item)
return node->GetVolumeId();
}
void PrusaObjectDataViewModel::GetObjectAndVolumeIdsByItem(const wxDataViewItem& item, int& obj_idx, int& vol_idx)
{
wxASSERT(item.IsOk());
obj_idx = vol_idx = -1;
PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
if (!node) return;
vol_idx = node->GetVolumeId();
PrusaObjectDataViewModelNode *parent_node = node->GetParent();
if (!parent_node) return;
auto it = find(m_objects.begin(), m_objects.end(), parent_node);
if (it != m_objects.end())
obj_idx = it - m_objects.begin();
}
wxString PrusaObjectDataViewModel::GetName(const wxDataViewItem &item) const
{
PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();