3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 19:57:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ENH: Allow users to adjust the order of components in assemble

Browse source 
Change-Id: Ie4b979e4cfdf99d822801400cd6b54773f526d7a
(cherry picked from commit 2b8b32a2d2d8181d1ab0c490e1a7b4333dc34fad)
This commit is contained in:
zhimin.zeng 2023-08-01 16:05:55 +08:00 • committed by lane.wei
parent 42a69e3e20
commit c330dbe27a
1 changed files with 94 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1466,34 +1466,45 @@ void ObjectList::key_event(wxKeyEvent& event)
void ObjectList::OnBeginDrag(wxDataViewEvent &event) void ObjectList::OnBeginDrag(wxDataViewEvent &event)
{ {
int curr_obj_id = m_objects_model->GetIdByItem(event.GetItem());
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list();
int from_plate = partplate_list.find_instance(curr_obj_id, 0);
if (from_plate == -1) {
event.Veto();
return;
}
auto curr_plate_seq = partplate_list.get_plate(from_plate)->get_print_seq();
if (curr_plate_seq == PrintSequence::ByDefault) {
auto curr_preset_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
if (curr_preset_config.has("print_sequence"))
curr_plate_seq = curr_preset_config.option<ConfigOptionEnum<PrintSequence>>("print_sequence")->value;
}
if (curr_plate_seq != PrintSequence::ByObject) {
//drag forbidden under bylayer mode
event.Veto();
return;
}
const wxDataViewItem item(event.GetItem());
const bool mult_sel = multiple_selection(); const bool mult_sel = multiple_selection();
const ItemType& type = m_objects_model->GetItemType(item); if (mult_sel) {
if (mult_sel || (type != itObject)) {
//drag only allowed for single object
event.Veto(); event.Veto();
return; return;
} }
const wxDataViewItem item(event.GetItem());
const ItemType& type = m_objects_model->GetItemType(item);
if (!(type & (itVolume | itObject))) {
event.Veto();
return;
}
if (type & itObject) {
int curr_obj_id = m_objects_model->GetIdByItem(event.GetItem());
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list();
int from_plate = partplate_list.find_instance(curr_obj_id, 0);
if (from_plate == -1) {
event.Veto();
return;
}
auto curr_plate_seq = partplate_list.get_plate(from_plate)->get_print_seq();
if (curr_plate_seq == PrintSequence::ByDefault) {
auto curr_preset_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
if (curr_preset_config.has("print_sequence"))
curr_plate_seq = curr_preset_config.option<ConfigOptionEnum<PrintSequence>>("print_sequence")->value;
}
if (curr_plate_seq != PrintSequence::ByObject) {
//drag forbidden under bylayer mode
event.Veto();
return;
}
m_dragged_data.init(m_objects_model->GetIdByItem(item), type);
}
else if (type & itVolume){
m_dragged_data.init(m_objects_model->GetObjectIdByItem(item), m_objects_model->GetVolumeIdByItem(item), type);
}
#if 0 #if 0
if ((mult_sel && !selected_instances_of_same_object()) || if ((mult_sel && !selected_instances_of_same_object()) ||
(!mult_sel && (GetSelection() != item)) ) { (!mult_sel && (GetSelection() != item)) ) {
@ -1522,9 +1533,8 @@ void ObjectList::OnBeginDrag(wxDataViewEvent &event)
type&itVolume ? m_objects_model->GetVolumeIdByItem(item) : type&itVolume ? m_objects_model->GetVolumeIdByItem(item) :
m_objects_model->GetInstanceIdByItem(item), m_objects_model->GetInstanceIdByItem(item),
type); type);
#else
m_dragged_data.init(m_objects_model->GetIdByItem(item), type);
#endif #endif
/* Under MSW or OSX, DnD moves an item to the place of another selected item /* Under MSW or OSX, DnD moves an item to the place of another selected item
* But under GTK, DnD moves an item between another two items. * But under GTK, DnD moves an item between another two items.
* And as a result - call EVT_CHANGE_SELECTION to unselect all items. * And as a result - call EVT_CHANGE_SELECTION to unselect all items.
@ -1544,37 +1554,33 @@ void ObjectList::OnBeginDrag(wxDataViewEvent &event)
bool ObjectList::can_drop(const wxDataViewItem& item, int& src_obj_id, int& src_plate, int& dest_obj_id, int& dest_plate) const bool ObjectList::can_drop(const wxDataViewItem& item, int& src_obj_id, int& src_plate, int& dest_obj_id, int& dest_plate) const
{ {
#if 1 if (!item.IsOk()
if (!item.IsOk() || (m_objects_model->GetItemType(item) != m_dragged_data.type())) || (m_objects_model->GetItemType(item) != m_dragged_data.type())
|| !(m_dragged_data.type() & (itVolume|itObject)))
return false; return false;
int from_obj_id = m_dragged_data.obj_idx(); if (m_dragged_data.type() & itObject){
int to_obj_id = m_objects_model->GetIdByItem(item); int from_obj_id = m_dragged_data.obj_idx();
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list(); int to_obj_id = m_objects_model->GetIdByItem(item);
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list();
int from_plate = partplate_list.find_instance(from_obj_id, 0); int from_plate = partplate_list.find_instance(from_obj_id, 0);
if (from_plate == -1) if (from_plate == -1)
return false; return false;
int to_plate = partplate_list.find_instance(to_obj_id, 0); int to_plate = partplate_list.find_instance(to_obj_id, 0);
if ((to_plate == -1) || (from_plate != to_plate)) if ((to_plate == -1) || (from_plate != to_plate))
return false; return false;
src_obj_id = from_obj_id; src_obj_id = from_obj_id;
dest_obj_id = to_obj_id; dest_obj_id = to_obj_id;
src_plate = from_plate; src_plate = from_plate;
dest_plate = to_plate; dest_plate = to_plate;
#else
// move instance(s) or object on "empty place" of ObjectList
if ( (m_dragged_data.type() & (itInstance | itObject)) && !item.IsOk() )
return true;
// type of moved item should be the same as a "destination" item // move instance(s) or object on "empty place" of ObjectList
if (!item.IsOk() || !(m_dragged_data.type() & (itVolume|itObject)) || // if ( (m_dragged_data.type() & (itInstance | itObject)) && !item.IsOk() )
m_objects_model->GetItemType(item) != m_dragged_data.type() ) // return true;
return false; }
else if (m_dragged_data.type() & itVolume) { // move volumes inside one object only
// move volumes inside one object only
if (m_dragged_data.type() & itVolume) {
if (m_dragged_data.obj_idx() != m_objects_model->GetObjectIdByItem(item)) if (m_dragged_data.obj_idx() != m_objects_model->GetObjectIdByItem(item))
return false; return false;
wxDataViewItem dragged_item = m_objects_model->GetItemByVolumeId(m_dragged_data.obj_idx(), m_dragged_data.sub_obj_idx()); wxDataViewItem dragged_item = m_objects_model->GetItemByVolumeId(m_dragged_data.obj_idx(), m_dragged_data.sub_obj_idx());
@ -1609,10 +1615,8 @@ bool ObjectList::can_drop(const wxDataViewItem& item, int& src_obj_id, int& src_
return false; return false;
return m_objects_model->GetVolumeIdByItem(item) != 0; return m_objects_model->GetVolumeIdByItem(item) != 0;
} }
return false; return false;
} }
#endif
return true; return true;
} }
@ -1639,78 +1643,52 @@ void ObjectList::OnDrop(wxDataViewEvent &event)
return; return;
} }
#if 1 //#if 1
take_snapshot("Object order changed"); take_snapshot("Object order changed");
int delta = dest_obj_id < src_obj_id ? -1 : 1; if(m_dragged_data.type() & itObject){
PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list(); int delta = dest_obj_id < src_obj_id ? -1 : 1;
/*int cnt = 0, cur_id = src_obj_id, next_id, total = abs(src_obj_id - dest_obj_id); PartPlateList& partplate_list = wxGetApp().plater()->get_partplate_list();
//for (cur_id = src_obj_id; cnt < total; id += delta, cnt++) /*int cnt = 0, cur_id = src_obj_id, next_id, total = abs(src_obj_id - dest_obj_id);
next_id = src_obj_id + delta; //for (cur_id = src_obj_id; cnt < total; id += delta, cnt++)
while (cnt < total) next_id = src_obj_id + delta;
{ while (cnt < total)
int cur_plate = partplate_list.find_instance(next_id, 0); {
if (cur_plate != src_plate) { int cur_plate = partplate_list.find_instance(next_id, 0);
if (cur_plate != src_plate) {
cnt ++;
next_id += delta;
continue;
}
std::swap((*m_objects)[cur_id], (*m_objects)[next_id]);
cur_id = next_id;
cnt ++; cnt ++;
next_id += delta; next_id += delta;
continue; }*/
}
std::swap((*m_objects)[cur_id], (*m_objects)[next_id]);
cur_id = next_id;
cnt ++;
next_id += delta;
}*/
int cnt = 0;
for (int id = src_obj_id; cnt < abs(src_obj_id - dest_obj_id); id += delta, cnt++)
std::swap((*m_objects)[id], (*m_objects)[id + delta]);
select_item(m_objects_model->ReorganizeObjects(src_obj_id, dest_obj_id));
partplate_list.reload_all_objects(false, src_plate);
changed_object(src_obj_id);
#else
if (m_dragged_data.type() == itInstance)
{
// BBS: remove snapshot name "Instances to Separated Objects"
Plater::TakeSnapshot snapshot(wxGetApp().plater(),"");
instances_to_separated_object(m_dragged_data.obj_idx(), m_dragged_data.inst_idxs());
m_dragged_data.clear();
return;
}
take_snapshot((m_dragged_data.type() == itVolume) ? "Object parts order changed" : "Object order changed");
if (m_dragged_data.type() & itVolume)
{
int from_volume_id = m_dragged_data.sub_obj_idx();
int to_volume_id = m_objects_model->GetVolumeIdByItem(item);
int delta = to_volume_id < from_volume_id ? -1 : 1;
auto& volumes = (*m_objects)[m_dragged_data.obj_idx()]->volumes;
int cnt = 0; int cnt = 0;
for (int id = from_volume_id; cnt < abs(from_volume_id - to_volume_id); id += delta, cnt++) for (int id = src_obj_id; cnt < abs(src_obj_id - dest_obj_id); id += delta, cnt++)
std::swap(volumes[id], volumes[id + delta]); std::swap((*m_objects)[id], (*m_objects)[id + delta]);
select_item(m_objects_model->ReorganizeObjects(src_obj_id, dest_obj_id));
partplate_list.reload_all_objects(false, src_plate);
changed_object(src_obj_id);
}
else if (m_dragged_data.type() & itVolume) {
int from_volume_id = m_dragged_data.sub_obj_idx();
int to_volume_id = m_objects_model->GetVolumeIdByItem(item);
int delta = to_volume_id < from_volume_id ? -1 : 1;
auto &volumes = (*m_objects)[m_dragged_data.obj_idx()]->volumes;
int cnt = 0;
for (int id = from_volume_id; cnt < abs(from_volume_id - to_volume_id); id += delta, cnt++) std::swap(volumes[id], volumes[id + delta]);
select_item(m_objects_model->ReorganizeChildren(from_volume_id, to_volume_id, m_objects_model->GetParent(item))); select_item(m_objects_model->ReorganizeChildren(from_volume_id, to_volume_id, m_objects_model->GetParent(item)));
changed_object(m_dragged_data.obj_idx());
} }
else if (m_dragged_data.type() & itObject)
{
int from_obj_id = m_dragged_data.obj_idx();
int to_obj_id = item.IsOk() ? m_objects_model->GetIdByItem(item) : ((int)m_objects->size()-1);
int delta = to_obj_id < from_obj_id ? -1 : 1;
int cnt = 0;
for (int id = from_obj_id; cnt < abs(from_obj_id - to_obj_id); id += delta, cnt++)
std::swap((*m_objects)[id], (*m_objects)[id + delta]);
select_item(m_objects_model->ReorganizeObjects(from_obj_id, to_obj_id));
}
changed_object(m_dragged_data.obj_idx());
#endif
m_dragged_data.clear(); m_dragged_data.clear();