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

FIX:ui_and_3d_volume_map should consider obj_idx

Browse Source 
jira: github 5195
Change-Id: I0726b183257604336c274e60d8cc76a3f81877b7
(cherry picked from commit b82de541f5860553a4ec3d88396676f4cbca0b2e)
This commit is contained in:
zhou.xu
2024-11-14 21:08:19 +08:00
committed by Noisyfox
parent 8e288051e3
commit 92a71d27dc
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1057,11 +1057,8 @@ void ObjectList::update_filament_in_config(const wxDataViewItem& item)
const int ui_volume_idx = m_objects_model->GetVolumeIdByItem(item); const int ui_volume_idx = m_objects_model->GetVolumeIdByItem(item);
if (obj_idx < 0 || ui_volume_idx < 0) if (obj_idx < 0 || ui_volume_idx < 0)
return; return;
auto &ui_and_3d_volume_map = m_objects_model->get_ui_and_3d_volume_map(); int volume_in3d_idx = m_objects_model->get_real_volume_index_in_3d(obj_idx,ui_volume_idx);
if (ui_and_3d_volume_map.find(ui_volume_idx) == ui_and_3d_volume_map.end()) { m_config = &(*m_objects)[obj_idx]->volumes[volume_in3d_idx]->config;
return;
}
m_config = &(*m_objects)[obj_idx]->volumes[ui_and_3d_volume_map[ui_volume_idx]]->config;
} }
else if (item_type & itLayer) else if (item_type & itLayer)
m_config = &get_item_config(item); m_config = &get_item_config(item);
@@ -3947,7 +3944,11 @@ wxDataViewItemArray ObjectList::add_volumes_to_object_in_list(size_t obj_idx, st
int volume_idx{-1}; int volume_idx{-1};
auto& ui_and_3d_volume_map = m_objects_model->get_ui_and_3d_volume_map(); auto& ui_and_3d_volume_map = m_objects_model->get_ui_and_3d_volume_map();
ui_and_3d_volume_map.clear(); for (auto item : ui_and_3d_volume_map) {
if (item.first == obj_idx) {
item.second.clear();
}
}
int ui_volume_idx = 0; int ui_volume_idx = 0;
for (const ModelVolume *volume : object->volumes) { for (const ModelVolume *volume : object->volumes) {
++volume_idx; ++volume_idx;
@@ -3963,7 +3964,7 @@ wxDataViewItemArray ObjectList::add_volumes_to_object_in_list(size_t obj_idx, st
get_warning_icon_name(volume->mesh().stats()), get_warning_icon_name(volume->mesh().stats()),
volume->config.has("extruder") ? volume->config.extruder() : 0, volume->config.has("extruder") ? volume->config.extruder() : 0,
false); false);
ui_and_3d_volume_map[ui_volume_idx] = volume_idx; ui_and_3d_volume_map[obj_idx][ui_volume_idx] = volume_idx;
ui_volume_idx++; ui_volume_idx++;
add_settings_item(vol_item, &volume->config.get()); add_settings_item(vol_item, &volume->config.get());
@@ -4688,7 +4689,7 @@ void ObjectList::update_selections()
if (object(obj_idx)->volumes[vol_idx]->is_cut_connector()) if (object(obj_idx)->volumes[vol_idx]->is_cut_connector())
sels.Add(m_objects_model->GetInfoItemByType(m_objects_model->GetItemById(obj_idx), InfoItemType::CutConnectors)); sels.Add(m_objects_model->GetInfoItemByType(m_objects_model->GetItemById(obj_idx), InfoItemType::CutConnectors));
else { else {
vol_idx = m_objects_model->get_real_volume_index_in_ui(vol_idx); vol_idx = m_objects_model->get_real_volume_index_in_ui(obj_idx,vol_idx);
sels.Add(m_objects_model->GetItemByVolumeId(obj_idx, vol_idx)); sels.Add(m_objects_model->GetItemByVolumeId(obj_idx, vol_idx));
} }
} }
@@ -4795,7 +4796,7 @@ void ObjectList::update_selections_on_canvas()
if (type == itVolume) { if (type == itVolume) {
int vol_idx = m_objects_model->GetVolumeIdByItem(item); int vol_idx = m_objects_model->GetVolumeIdByItem(item);
vol_idx = m_objects_model->get_real_volume_index_in_3d(vol_idx); vol_idx = m_objects_model->get_real_volume_index_in_3d(obj_idx,vol_idx);
std::vector<unsigned int> idxs = selection.get_volume_idxs_from_volume(obj_idx, std::max(instance_idx, 0), vol_idx); std::vector<unsigned int> idxs = selection.get_volume_idxs_from_volume(obj_idx, std::max(instance_idx, 0), vol_idx);
volume_idxs.insert(volume_idxs.end(), idxs.begin(), idxs.end()); volume_idxs.insert(volume_idxs.end(), idxs.begin(), idxs.end());
} }

24
src/slic3r/GUI/ObjectDataViewModel.hpp
View File

@@ -352,26 +352,30 @@ class ObjectDataViewModel :public wxDataViewModel
wxDataViewCtrl* m_ctrl { nullptr }; wxDataViewCtrl* m_ctrl { nullptr };
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> assembly_name_list; std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> assembly_name_list;
std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> search_found_list; std::vector<std::tuple<ObjectDataViewModelNode*, wxString, wxString>> search_found_list;
std::map<int, int> m_ui_and_3d_volume_map; std::map<int,std::map<int, int>> m_ui_and_3d_volume_maps;
public: public:
ObjectDataViewModel(); ObjectDataViewModel();
~ObjectDataViewModel(); ~ObjectDataViewModel();
void Init(); void Init();
std::map<int, int> &get_ui_and_3d_volume_map() { return m_ui_and_3d_volume_map; } std::map<int, std::map<int, int>> &get_ui_and_3d_volume_map() { return m_ui_and_3d_volume_maps; }
int get_real_volume_index_in_3d(int ui_value) int get_real_volume_index_in_3d(int ui_object_value, int ui_volume_value)
{ {
if (m_ui_and_3d_volume_map.find(ui_value) != m_ui_and_3d_volume_map.end()) { if (m_ui_and_3d_volume_maps.find(ui_object_value) != m_ui_and_3d_volume_maps.end()) {
return m_ui_and_3d_volume_map[ui_value]; auto cur_map = m_ui_and_3d_volume_maps[ui_object_value];
if (cur_map.find(ui_volume_value) != cur_map.end()) { return cur_map[ui_volume_value]; }
} }
return ui_value; return ui_volume_value;
} }
int get_real_volume_index_in_ui(int _3d_value) int get_real_volume_index_in_ui(int ui_object_value, int _3d_value)
{ {
for (auto item: m_ui_and_3d_volume_map) { if (m_ui_and_3d_volume_maps.find(ui_object_value) != m_ui_and_3d_volume_maps.end()) {
if (item.second == _3d_value) { auto cur_map = m_ui_and_3d_volume_maps[ui_object_value];
return item.first; for (auto item : cur_map) {
if (item.second == _3d_value) {
return item.first;
}
} }
} }
return _3d_value; return _3d_value;