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

ObjectList: Implemented interface for delete InfoItem

Browse Source
This commit is contained in:
YuSanka 2021-08-12 13:53:22 +02:00 committed by Lukas Matena
parent 5a005e8e0a
commit 08e2e29afd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1778,10 +1778,8 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
del_layers_from_object(obj_idx); del_layers_from_object(obj_idx);
else if (type & itLayer && obj_idx != -1) else if (type & itLayer && obj_idx != -1)
del_layer_from_object(obj_idx, m_objects_model->GetLayerRangeByItem(item)); del_layer_from_object(obj_idx, m_objects_model->GetLayerRangeByItem(item));
else if (type & itInfo && obj_idx != -1) { else if (type & itInfo && obj_idx != -1)
Unselect(item); del_info_item(obj_idx, m_objects_model->GetInfoItemType(item));
Select(parent);
}
else if (idx == -1) else if (idx == -1)
return; return;
else if (!del_subobject_from_object(obj_idx, idx, type)) else if (!del_subobject_from_object(obj_idx, idx, type))
@ -1795,6 +1793,11 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
update_info_items(obj_idx); update_info_items(obj_idx);
} }
void ObjectList::del_info_item(const int obj_idx, InfoItemType type)
{
// ToDo lmFIXME :)
}
void ObjectList::del_settings_from_config(const wxDataViewItem& parent_item) void ObjectList::del_settings_from_config(const wxDataViewItem& parent_item)
{ {
const bool is_layer_settings = m_objects_model->GetItemType(parent_item) == itLayer; const bool is_layer_settings = m_objects_model->GetItemType(parent_item) == itLayer;

1
src/slic3r/GUI/GUI_ObjectList.hpp
View File

@ -254,6 +254,7 @@ public:
void del_layer_from_object(const int obj_idx, const t_layer_height_range& layer_range); void del_layer_from_object(const int obj_idx, const t_layer_height_range& layer_range);
void del_layers_from_object(const int obj_idx); void del_layers_from_object(const int obj_idx);
bool del_subobject_from_object(const int obj_idx, const int idx, const int type); bool del_subobject_from_object(const int obj_idx, const int idx, const int type);
void del_info_item(const int obj_idx, InfoItemType type);
void split(); void split();
void merge(bool to_multipart_object); void merge(bool to_multipart_object);
void layers_editing(); void layers_editing();

2
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@ -1141,7 +1141,7 @@ void ObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType& type
if (!node || if (!node ||
node->GetIdx() <-1 || node->GetIdx() <-1 ||
( node->GetIdx() == -1 && ( node->GetIdx() == -1 &&
!(node->GetType() & (itObject | itSettings | itInstanceRoot | itLayerRoot/* | itLayer*/)) !(node->GetType() & (itObject | itSettings | itInstanceRoot | itLayerRoot | itInfo))
) )
) )
return; return;