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

Fix to last commit

Browse Source
This commit is contained in:
YuSanka 2018-09-04 09:25:54 +02:00
parent fb3a4015f6
commit af6a312fea
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -877,7 +877,6 @@ void update_settings_list()
const auto item = m_objects_ctrl->GetSelection(); const auto item = m_objects_ctrl->GetSelection();
if (m_config && m_objects_model->IsSettingsItem(item)) if (m_config && m_objects_model->IsSettingsItem(item))
{ {
show_manipulations = false;
auto extra_column = [](wxWindow* parent, const Line& line) auto extra_column = [](wxWindow* parent, const Line& line)
{ {
auto opt_key = (line.get_options())[0].opt_id; //we assume that we have one option per line auto opt_key = (line.get_options())[0].opt_id; //we assume that we have one option per line
@ -896,8 +895,8 @@ void update_settings_list()
std::map<std::string, std::vector<std::string>> cat_options; std::map<std::string, std::vector<std::string>> cat_options;
auto opt_keys = (*m_config)->keys(); auto opt_keys = (*m_config)->keys();
if (!(opt_keys.size() == 1 && opt_keys[0] == "extruder")) m_og_settings.resize(0);
// return; if (!(opt_keys.size() == 1 && opt_keys[0] == "extruder"))// return;
{ {
auto extruders_cnt = get_preset_bundle()->printers.get_selected_preset().printer_technology() == ptSLA ? 1 : auto extruders_cnt = get_preset_bundle()->printers.get_selected_preset().printer_technology() == ptSLA ? 1 :
get_preset_bundle()->printers.get_edited_preset().config.option<ConfigOptionFloats>("nozzle_diameter")->values.size(); get_preset_bundle()->printers.get_edited_preset().config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
@ -915,8 +914,6 @@ void update_settings_list()
cat_options[category] = cat_opt; cat_options[category] = cat_opt;
} }
m_og_settings.resize(0);
for (auto& cat : cat_options) { for (auto& cat : cat_options) {
if (cat.second.size() == 1 && cat.second[0] == "extruder") if (cat.second.size() == 1 && cat.second[0] == "extruder")
continue; continue;
@ -937,12 +934,14 @@ void update_settings_list()
m_option_sizer->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 0); m_option_sizer->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 0);
m_og_settings.push_back(optgroup); m_og_settings.push_back(optgroup);
} }
if (m_og_settings.empty()) {
m_objects_ctrl->Select(m_objects_model->Delete(item));
show_manipulations = true;
}
} }
if (m_og_settings.empty()) {
m_objects_ctrl->Select(m_objects_model->Delete(item));
part_selection_changed();
}
else
show_manipulations = false;
} }
show_manipulation_og(show_manipulations); show_manipulation_og(show_manipulations);
@ -1012,6 +1011,7 @@ void get_settings_choice(wxMenu *menu, int id, bool is_part)
const auto settings_item = m_objects_model->HasSettings(item); const auto settings_item = m_objects_model->HasSettings(item);
m_objects_ctrl->Select(settings_item ? settings_item : m_objects_ctrl->Select(settings_item ? settings_item :
m_objects_model->AddSettingsChild(item)); m_objects_model->AddSettingsChild(item));
part_selection_changed();
} }
// ******************** // ********************

5
xs/src/slic3r/GUI/wxExtensions.cpp
View File

@ -480,9 +480,10 @@ wxDataViewItem PrusaObjectDataViewModel::Delete(const wxDataViewItem &item)
delete node; delete node;
// set m_containet to FALSE if parent has no child // set m_containet to FALSE if parent has no child
if (node_parent && node_parent->GetChildCount() == 0){ if (node_parent) {
#ifndef __WXGTK__ #ifndef __WXGTK__
node_parent->m_container = false; if (node_parent->GetChildCount() == 0)
node_parent->m_container = false;
#endif //__WXGTK__ #endif //__WXGTK__
ret_item = parent; ret_item = parent;
} }