3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-23 21:05:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: Delete and search object outside the plate

Browse source 
JIRA:
1. STUDIO-5132 Deleting object outside the plate will crash
2. STUDIO-5146 The search function cannot search for object outside the plate

Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com>
Change-Id: I84cb3fe990a9c2a182e7434c262466a70545280e
This commit is contained in:
Kunlong Ma 2023-11-07 17:20:25 +08:00 • committed by Lane.Wei
parent 3fe19f87f3
commit 939f64d90d
5 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -781,14 +781,15 @@ void ObjectList::printable_state_changed(const std::vector<ObjectVolumeID>& ov_i
void ObjectList::search_object_list() {
auto found_size = m_found_list.size();
auto found_list = m_objects_model->get_search_list();
auto found_size = found_list.size();
if (cur_pos >= found_size) {
cur_pos = 0;
}
if (cur_pos < found_size) {
wxDataViewItem cur_item = m_found_list.Item(cur_pos);
wxDataViewItem cur_item = found_list.Item(cur_pos);
select_item(cur_item);
cur_pos++;
ensure_current_item_visible();
@ -796,31 +797,13 @@ void ObjectList::search_object_list() {
}
}
void ObjectList::append_found_list(wxString current_search_text, wxDataViewItem item) {
wxString item_name = m_objects_model->GetName(item);
item_name = item_name.MakeLower();
if (item_name.find(current_search_text) != wxString::npos) {
m_found_list.Add(item);
}
ObjectDataViewModelNode* root = static_cast<ObjectDataViewModelNode*>(item.GetID());
size_t child_count = root->GetChildCount();
for (size_t i = 0; i < child_count; ++i) {
append_found_list(current_search_text, wxDataViewItem(root->GetNthChild(i)));
}
}
void ObjectList::set_found_list(wxString current_search_text) {
m_found_list.clear();
PartPlateList& ppl = wxGetApp().plater()->get_partplate_list();
current_search_text = current_search_text.MakeLower();
for (int i = 0; i < ppl.get_plate_count(); ++i) {
wxDataViewItem plate_item = m_objects_model->GetItemByPlateId(i);
append_found_list(current_search_text, plate_item);
}
m_objects_model->append_found_list(current_search_text);
if (current_search_text.empty()) {
if (ppl.get_plate_count() > 0) {
wxDataViewItem item = m_objects_model->GetItemByPlateId(0);
@ -832,8 +815,9 @@ void ObjectList::set_found_list(wxString current_search_text) {
column->SetTitle(_L("Name"));
}
else {
auto found_list = m_objects_model->get_search_list();
auto column = GetColumn(colName);
wxString match_num = wxString::Format("%d", m_found_list.size());
wxString match_num = wxString::Format("%d", found_list.size());
wxString match_message = " (" + match_num + _L(" search results") + ")";
wxString column_name = _L("Name") + match_message;
column->SetTitle(column_name);