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

Correct object splitting to parts (sub-objects)

Browse Source
This commit is contained in:
YuSanka 2018-07-31 12:04:01 +02:00
parent 814d255c77
commit 128d0f7708
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -608,7 +608,6 @@ void add_object_to_list(const std::string &name, ModelObject* model_object)
for (auto id = 0; id < model_object->volumes.size(); id++) for (auto id = 0; id < model_object->volumes.size(); id++)
m_objects_model->AddChild(item, model_object->volumes[id]->name, m_icon_solidmesh, false); m_objects_model->AddChild(item, model_object->volumes[id]->name, m_icon_solidmesh, false);
ModelObjectPtrs* objects = m_objects;
// part_selection_changed(); // part_selection_changed();
#ifdef __WXMSW__ #ifdef __WXMSW__
object_ctrl_selection_changed(); object_ctrl_selection_changed();
@ -841,6 +840,14 @@ void get_settings_choice(wxMenu *menu, int id, bool is_part)
update_settings_list(); update_settings_list();
} }
bool cur_item_hase_children()
{
wxDataViewItemArray children;
if (m_objects_model->GetChildren(m_objects_ctrl->GetSelection(), children) > 0)
return true;
return false;
}
wxMenu *create_add_part_popupmenu() wxMenu *create_add_part_popupmenu()
{ {
wxMenu *menu = new wxMenu; wxMenu *menu = new wxMenu;
@ -860,6 +867,7 @@ wxMenu *create_add_part_popupmenu()
auto menu_item = new wxMenuItem(menu, config_id_base + 3, _(L("Split to sub-objects"))); auto menu_item = new wxMenuItem(menu, config_id_base + 3, _(L("Split to sub-objects")));
menu_item->SetBitmap(m_bmp_split); menu_item->SetBitmap(m_bmp_split);
menu->Append(menu_item); menu->Append(menu_item);
menu_item->Enable(!cur_item_hase_children());
wxWindow* win = get_tab_panel()->GetPage(0); wxWindow* win = get_tab_panel()->GetPage(0);
@ -1111,11 +1119,15 @@ void on_btn_split()
volume = (*m_objects)[m_selected_object_id]->volumes[volume_id]; volume = (*m_objects)[m_selected_object_id]->volumes[volume_id];
DynamicPrintConfig& config = get_preset_bundle()->printers.get_edited_preset().config; DynamicPrintConfig& config = get_preset_bundle()->printers.get_edited_preset().config;
auto nozzle_dmrs_cnt = config.option<ConfigOptionFloats>("nozzle_diameter")->values.size(); auto nozzle_dmrs_cnt = config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
if (volume->split(nozzle_dmrs_cnt) > 1) { auto split_rez = volume->split(nozzle_dmrs_cnt);
auto model_object = (*m_objects)[m_selected_object_id]; if (split_rez == 1) {
for (auto id = 0; id < model_object->volumes.size(); id++) wxMessageBox(_(L("The selected object couldn't be split because it contains only one part.")));
m_objects_model->AddChild(item, model_object->volumes[id]->name, m_icon_solidmesh, false); return;
} }
auto model_object = (*m_objects)[m_selected_object_id];
for (auto id = 0; id < model_object->volumes.size(); id++)
m_objects_model->AddChild(item, model_object->volumes[id]->name, m_icon_solidmesh, false);
} }
void on_btn_move_up(){ void on_btn_move_up(){