GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-17 12:16:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed SPE-1014 (Support settings in context menu for modifier)

Browse Source
This commit is contained in:
YuSanka 2019-09-02 14:44:00 +02:00
parent dba5dd36f7
commit fdb51912c2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1071,9 +1071,11 @@ const std::vector<std::string>& ObjectList::get_options_for_bundle(const wxStrin
return empty; return empty;
} }
static bool improper_category(const std::string& category, const int extruders_cnt) static bool improper_category(const std::string& category, const int extruders_cnt, const bool is_object_settings = true)
{ {
return category.empty() || (extruders_cnt == 1 && (category == "Extruders" || category == "Wipe options" )); return category.empty() ||
extruders_cnt == 1 && (category == "Extruders" || category == "Wipe options" ) ||
!is_object_settings && category == "Support material";
} }
void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const bool is_part) void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const bool is_part)
@ -1087,7 +1089,7 @@ void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const
{ {
auto const opt = config.def()->get(option); auto const opt = config.def()->get(option);
auto category = opt->category; auto category = opt->category;
if (improper_category(category, extruders_cnt)) if (improper_category(category, extruders_cnt, !is_part))
continue; continue;
const std::string& label = !opt->full_label.empty() ? opt->full_label : opt->label; const std::string& label = !opt->full_label.empty() ? opt->full_label : opt->label;
@ -1404,7 +1406,7 @@ wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_)
menu->SetFirstSeparator(); menu->SetFirstSeparator();
// Add frequently settings // Add frequently settings
create_freq_settings_popupmenu(menu); create_freq_settings_popupmenu(menu, sel_vol==nullptr);
if (mode == comAdvanced) if (mode == comAdvanced)
return nullptr; return nullptr;
@ -1598,7 +1600,7 @@ wxMenu* ObjectList::create_settings_popupmenu(wxMenu *parent_menu)
return menu; return menu;
} }
void ObjectList::create_freq_settings_popupmenu(wxMenu *menu) void ObjectList::create_freq_settings_popupmenu(wxMenu *menu, const bool is_object_settings/* = true*/)
{ {
// Add default settings bundles // Add default settings bundles
const SettingsBundle& bundle = printer_technology() == ptFFF ? const SettingsBundle& bundle = printer_technology() == ptFFF ?
@ -1607,7 +1609,7 @@ void ObjectList::create_freq_settings_popupmenu(wxMenu *menu)
const int extruders_cnt = extruders_count(); const int extruders_cnt = extruders_count();
for (auto& it : bundle) { for (auto& it : bundle) {
if (improper_category(it.first, extruders_cnt)) if (improper_category(it.first, extruders_cnt, is_object_settings))
continue; continue;
append_menu_item(menu, wxID_ANY, _(it.first), "", append_menu_item(menu, wxID_ANY, _(it.first), "",
@ -2262,7 +2264,7 @@ SettingsBundle ObjectList::get_item_settings_bundle(const DynamicPrintConfig* co
for (auto& opt_key : opt_keys) for (auto& opt_key : opt_keys)
{ {
auto category = config->def()->get(opt_key)->category; auto category = config->def()->get(opt_key)->category;
if (improper_category(category, extruders_cnt)) if (improper_category(category, extruders_cnt, is_object_settings))
continue; continue;
std::vector< std::string > new_category; std::vector< std::string > new_category;

2
src/slic3r/GUI/GUI_ObjectList.hpp
View File

@ -241,7 +241,7 @@ public:
void create_part_popupmenu(wxMenu*menu); void create_part_popupmenu(wxMenu*menu);
void create_instance_popupmenu(wxMenu*menu); void create_instance_popupmenu(wxMenu*menu);
wxMenu* create_settings_popupmenu(wxMenu *parent_menu); wxMenu* create_settings_popupmenu(wxMenu *parent_menu);
void create_freq_settings_popupmenu(wxMenu *parent_menu); void create_freq_settings_popupmenu(wxMenu *parent_menu, const bool is_object_settings = true);
void update_opt_keys(t_config_option_keys& t_optopt_keys, const bool is_object); void update_opt_keys(t_config_option_keys& t_optopt_keys, const bool is_object);