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

Improved Delete() Add() ans Select() functions for Layer(s)Item

Browse source
This commit is contained in:
YuSanka 2019-05-27 16:13:24 +02:00
parent dd70dd6e10
commit 9d19e3d2a7
2 changed files with 67 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -1648,6 +1648,8 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
del_settings_from_config(); del_settings_from_config();
else if (type == itInstanceRoot && obj_idx != -1) else if (type == itInstanceRoot && obj_idx != -1)
del_instances_from_object(obj_idx); del_instances_from_object(obj_idx);
else if ((type & itLayerRoot) && obj_idx != -1)
/*del_layers_from_object(obj_idx)*/;
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))
@ -1728,6 +1730,8 @@ bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, con
} }
object->delete_instance(idx); object->delete_instance(idx);
} }
else if (type == itLayer) {
}
else else
return false; return false;
@ -1791,9 +1795,11 @@ void ObjectList::layers_editing()
if (!item || obj_idx < 0) if (!item || obj_idx < 0)
return; return;
wxDataViewItem layers_item = m_objects_model->GetItemByType(item, itLayerRoot); wxDataViewItem obj_item = m_objects_model->GetTopParent(item);
wxDataViewItem layers_item = m_objects_model->GetItemByType(obj_item, itLayerRoot);
if (!layers_item.IsOk()) if (!layers_item.IsOk())
layers_item = m_objects_model->AddLayersRoot(item); layers_item = m_objects_model->AddLayersRoot(obj_item);
select_item(layers_item); select_item(layers_item);
} }
@ -2171,7 +2177,8 @@ void ObjectList::update_selections()
m_selection_mode = smInstance; m_selection_mode = smInstance;
// We doesn't update selection if SettingsItem for the current object/part is selected // We doesn't update selection if SettingsItem for the current object/part is selected
if (GetSelectedItemsCount() == 1 && m_objects_model->GetItemType(GetSelection()) == itSettings ) // if (GetSelectedItemsCount() == 1 && m_objects_model->GetItemType(GetSelection()) == itSettings )
if (GetSelectedItemsCount() == 1 && m_objects_model->GetItemType(GetSelection()) & (itSettings | itLayerRoot | itLayer))
{ {
const auto item = GetSelection(); const auto item = GetSelection();
if (selection.is_single_full_object() && if (selection.is_single_full_object() &&
@ -2294,8 +2301,8 @@ void ObjectList::update_selections_on_canvas()
auto add_to_selection = [this](const wxDataViewItem& item, Selection& selection, int instance_idx, bool as_single_selection) auto add_to_selection = [this](const wxDataViewItem& item, Selection& selection, int instance_idx, bool as_single_selection)
{ {
const ItemType& type = m_objects_model->GetItemType(item); const ItemType& type = m_objects_model->GetItemType(item);
if ( type == itInstanceRoot || m_objects_model->GetParent(item) == wxDataViewItem(0) ) { if ( type == itLayerRoot || m_objects_model->GetParent(item) == wxDataViewItem(0) ) {
wxDataViewItem obj_item = type == itInstanceRoot ? m_objects_model->GetParent(item) : item; wxDataViewItem obj_item = type == itLayerRoot ? m_objects_model->GetParent(item) : item;
selection.add_object(m_objects_model->GetIdByItem(obj_item), as_single_selection); selection.add_object(m_objects_model->GetIdByItem(obj_item), as_single_selection);
return; return;
} }
@ -2317,7 +2324,7 @@ void ObjectList::update_selections_on_canvas()
if (sel_cnt == 1) { if (sel_cnt == 1) {
wxDataViewItem item = GetSelection(); wxDataViewItem item = GetSelection();
if (m_objects_model->GetItemType(item) & (itSettings|itInstanceRoot)) if (m_objects_model->GetItemType(item) & (itSettings | itInstanceRoot | itLayerRoot | itLayer))
add_to_selection(m_objects_model->GetParent(item), selection, instance_idx, true); add_to_selection(m_objects_model->GetParent(item), selection, instance_idx, true);
else else
add_to_selection(item, selection, instance_idx, true); add_to_selection(item, selection, instance_idx, true);

84
src/slic3r/GUI/wxExtensions.cpp
View file

@ -540,6 +540,22 @@ void ObjectDataViewModelNode::SetIdx(const int& idx)
// ObjectDataViewModel // ObjectDataViewModel
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static int get_root_idx(ObjectDataViewModelNode *parent_node, const ItemType root_type)
{
// because of istance_root and layers_root are at the end of the list, so
// start locking from the end
for (int root_idx = parent_node->GetChildCount() - 1; root_idx >= 0; root_idx--)
{
// if there is SettingsItem or VolumeItem, then RootItems don't exist in current ObjectItem
if (parent_node->GetNthChild(root_idx)->GetType() & (itSettings | itVolume))
break;
if (parent_node->GetNthChild(root_idx)->GetType() & root_type)
return root_idx;
}
return -1;
}
ObjectDataViewModel::ObjectDataViewModel() ObjectDataViewModel::ObjectDataViewModel()
{ {
m_bitmap_cache = new Slic3r::GUI::BitmapCache; m_bitmap_cache = new Slic3r::GUI::BitmapCache;
@ -584,10 +600,10 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder); wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
// because of istance_root is a last item of the object // get insertion position according to the existed Layers and/or Instances Items
int insert_position = root->GetChildCount() - 1; int insert_position = get_root_idx(root, itLayerRoot);
if (insert_position < 0 || root->GetNthChild(insert_position)->m_type != itInstanceRoot) if (insert_position < 0)
insert_position = -1; insert_position = get_root_idx(root, itInstanceRoot);
const bool obj_errors = root->m_bmp.IsOk(); const bool obj_errors = root->m_bmp.IsOk();
@ -603,7 +619,7 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
ItemAdded(parent_item, child); ItemAdded(parent_item, child);
root->m_volumes_cnt++; root->m_volumes_cnt++;
if (insert_position > 0) insert_position++; if (insert_position >= 0) insert_position++;
} }
const auto node = new ObjectDataViewModelNode(root, name, GetVolumeIcon(volume_type, has_errors), extruder_str, root->m_volumes_cnt); const auto node = new ObjectDataViewModelNode(root, name, GetVolumeIcon(volume_type, has_errors), extruder_str, root->m_volumes_cnt);
@ -636,22 +652,6 @@ wxDataViewItem ObjectDataViewModel::AddSettingsChild(const wxDataViewItem &paren
return child; return child;
} }
static int get_root_idx(ObjectDataViewModelNode *parent_node, const ItemType root_type)
{
// because of istance_root and layers_root are at the end of the list, so
// start locking from the end
for (int root_idx = parent_node->GetChildCount() - 1; root_idx >= 0; root_idx--)
{
// if there is SettingsItem or VolumeItem, then RootItems don't exist in current ObjectItem
if (parent_node->GetNthChild(root_idx)->GetType() & (itSettings | itVolume))
break;
if (parent_node->GetNthChild(root_idx)->GetType() & root_type)
return root_idx;
}
return -1;
}
/* return values: /* return values:
* true => root_node is created and added to the parent_root * true => root_node is created and added to the parent_root
* false => root node alredy exists * false => root node alredy exists
@ -723,6 +723,8 @@ wxDataViewItem ObjectDataViewModel::AddLayersRoot(const wxDataViewItem &parent_i
if (appended) if (appended)
ItemAdded(parent_item, layer_root_item);// notify control ItemAdded(parent_item, layer_root_item);// notify control
AddLayersChild(layer_root_item);
return wxDataViewItem((void*)layer_root_item); return wxDataViewItem((void*)layer_root_item);
} }
@ -732,9 +734,15 @@ wxDataViewItem ObjectDataViewModel::AddLayersChild(const wxDataViewItem &parent_
if (!parent_node) return wxDataViewItem(0); if (!parent_node) return wxDataViewItem(0);
// get LayerRoot node // get LayerRoot node
const int root_idx = get_root_idx(parent_node, itLayerRoot); ObjectDataViewModelNode *layer_root_node;
if (root_idx < 0) return wxDataViewItem(0);
ObjectDataViewModelNode *layer_root_node = parent_node->GetNthChild(root_idx); if (parent_node->GetType() & itLayerRoot)
layer_root_node = parent_node;
else {
const int root_idx = get_root_idx(parent_node, itLayerRoot);
if (root_idx < 0) return wxDataViewItem(0);
layer_root_node = parent_node->GetNthChild(root_idx);
}
const wxDataViewItem layer_root_item((void*)layer_root_node); const wxDataViewItem layer_root_item((void*)layer_root_node);
@ -763,9 +771,9 @@ wxDataViewItem ObjectDataViewModel::Delete(const wxDataViewItem &item)
// NOTE: MyObjectTreeModelNodePtrArray is only an array of _pointers_ // NOTE: MyObjectTreeModelNodePtrArray is only an array of _pointers_
// thus removing the node from it doesn't result in freeing it // thus removing the node from it doesn't result in freeing it
if (node_parent) { if (node_parent) {
if (node->m_type == itInstanceRoot) if (node->m_type & (itInstanceRoot|itLayerRoot))
{ {
for (int i = node->GetChildCount() - 1; i > 0; i--) for (int i = node->GetChildCount() - 1; i >= (node->m_type & itInstanceRoot ? 1 : 0); i--)
Delete(wxDataViewItem(node->GetNthChild(i))); Delete(wxDataViewItem(node->GetNthChild(i)));
return parent; return parent;
} }
@ -774,7 +782,7 @@ wxDataViewItem ObjectDataViewModel::Delete(const wxDataViewItem &item)
auto idx = node->GetIdx(); auto idx = node->GetIdx();
if (node->m_type == itVolume) { if (node->m_type & (itVolume|itLayer)) {
node_parent->m_volumes_cnt--; node_parent->m_volumes_cnt--;
DeleteSettings(item); DeleteSettings(item);
} }
@ -810,6 +818,22 @@ wxDataViewItem ObjectDataViewModel::Delete(const wxDataViewItem &item)
delete node_parent; delete node_parent;
ret_item = wxDataViewItem(obj_node); ret_item = wxDataViewItem(obj_node);
#ifndef __WXGTK__
if (obj_node->GetChildCount() == 0)
obj_node->m_container = false;
#endif //__WXGTK__
ItemDeleted(ret_item, wxDataViewItem(node_parent));
return ret_item;
}
// if there was last layer item, delete this one and layers root item
if (node_parent->GetChildCount() == 0 && node_parent->m_type == itLayerRoot)
{
ObjectDataViewModelNode *obj_node = node_parent->GetParent();
obj_node->GetChildren().Remove(node_parent);
delete node_parent;
ret_item = wxDataViewItem(obj_node);
#ifndef __WXGTK__ #ifndef __WXGTK__
if (obj_node->GetChildCount() == 0) if (obj_node->GetChildCount() == 0)
obj_node->m_container = false; obj_node->m_container = false;
@ -819,7 +843,7 @@ wxDataViewItem ObjectDataViewModel::Delete(const wxDataViewItem &item)
} }
// if there is last volume item after deleting, delete this last volume too // if there is last volume item after deleting, delete this last volume too
if (node_parent->GetChildCount() <= 3) if (node_parent->GetChildCount() <= 3) // 3??? #ys_FIXME
{ {
int vol_cnt = 0; int vol_cnt = 0;
int vol_idx = 0; int vol_idx = 0;
@ -1120,7 +1144,7 @@ void ObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType& type
type = itUndef; type = itUndef;
ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID(); ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
if (!node || node->GetIdx() <-1 || node->GetIdx() ==-1 && !(node->GetType() & (itObject | itSettings | itInstanceRoot))) if (!node || node->GetIdx() <-1 || node->GetIdx() == -1 && !(node->GetType() & (itObject | itSettings | itInstanceRoot | itLayerRoot/* | itLayer*/)))
return; return;
idx = node->GetIdx(); idx = node->GetIdx();
@ -1128,7 +1152,7 @@ void ObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType& type
ObjectDataViewModelNode *parent_node = node->GetParent(); ObjectDataViewModelNode *parent_node = node->GetParent();
if (!parent_node) return; if (!parent_node) return;
if (type == itInstance) if (type & (itInstance | itLayer))
parent_node = node->GetParent()->GetParent(); parent_node = node->GetParent()->GetParent();
if (!parent_node || parent_node->m_type != itObject) { type = itUndef; return; } if (!parent_node || parent_node->m_type != itObject) { type = itUndef; return; }