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

Increase and decrease command in object's context menu

Browse source
This commit is contained in:
Enrico Turri 2018-10-17 14:26:13 +02:00
parent d4371b6089
commit 23123cac2e
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/slic3r/GUI/Plater.cpp
View file

@ -729,7 +729,7 @@ struct Plater::priv
MainFrame *main_frame; MainFrame *main_frame;
// Object popup menu // Object popup menu
wxMenu* object_menu; wxMenu object_menu;
// Data // Data
Slic3r::DynamicPrintConfig *config; Slic3r::DynamicPrintConfig *config;
@ -755,7 +755,6 @@ struct Plater::priv
static const std::regex pattern_zip_amf; static const std::regex pattern_zip_amf;
priv(Plater *q, MainFrame *main_frame); priv(Plater *q, MainFrame *main_frame);
~priv();
#if !ENABLE_EXTENDED_SELECTION #if !ENABLE_EXTENDED_SELECTION
std::vector<int> collect_selections(); std::vector<int> collect_selections();
@ -844,7 +843,6 @@ const std::regex Plater::priv::pattern_zip_amf("[.]zip[.]amf$", std::regex::icas
Plater::priv::priv(Plater *q, MainFrame *main_frame) : Plater::priv::priv(Plater *q, MainFrame *main_frame) :
q(q), q(q),
main_frame(main_frame), main_frame(main_frame),
object_menu(nullptr),
config(Slic3r::DynamicPrintConfig::new_from_defaults_keys({ config(Slic3r::DynamicPrintConfig::new_from_defaults_keys({
"bed_shape", "complete_objects", "extruder_clearance_radius", "skirts", "skirt_distance", "bed_shape", "complete_objects", "extruder_clearance_radius", "skirts", "skirt_distance",
"brim_width", "variable_layer_height", "serial_port", "serial_speed", "host_type", "print_host", "brim_width", "variable_layer_height", "serial_port", "serial_speed", "host_type", "print_host",
@ -961,12 +959,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) :
q->Layout(); q->Layout();
} }
Plater::priv::~priv()
{
if (object_menu != nullptr)
delete object_menu;
}
#if !ENABLE_EXTENDED_SELECTION #if !ENABLE_EXTENDED_SELECTION
std::vector<int> Plater::priv::collect_selections() std::vector<int> Plater::priv::collect_selections()
{ {
@ -1752,8 +1744,8 @@ void Plater::priv::on_right_click(Vec2dEvent& evt)
if (obj_idx == -1) if (obj_idx == -1)
return; return;
if ((q != nullptr) && (object_menu != nullptr)) if (q != nullptr)
q->PopupMenu(object_menu, (int)evt.data.x(), (int)evt.data.y()); q->PopupMenu(&object_menu, (int)evt.data.x(), (int)evt.data.y());
#else #else
// TODO // TODO
#endif // ENABLE_EXTENDED_SELECTION #endif // ENABLE_EXTENDED_SELECTION
@ -1821,15 +1813,26 @@ void Plater::priv::on_update_geometry(Vec3dsEvent<2>&)
bool Plater::priv::init_object_menu() bool Plater::priv::init_object_menu()
{ {
if (main_frame == nullptr) append_menu_item(&object_menu, wxID_ANY, _(L("Delete\tDel")), _(L("Remove the selected object")),
return false;
object_menu = new wxMenu();
if (object_menu == nullptr)
return false;
append_menu_item(object_menu, wxID_ANY, _(L("Delete…\tDel")), _(L("Remove the selected object")),
[this](wxCommandEvent&){ q->remove_selected(); }, "brick_delete.png"); [this](wxCommandEvent&){ q->remove_selected(); }, "brick_delete.png");
append_menu_item(&object_menu, wxID_ANY, _(L("Increase copies\t+")), _(L("Place one more copy of the selected object")),
[this](wxCommandEvent&){ q->increase(); }, "add.png");
wxMenuItem* item_decrease = append_menu_item(&object_menu, wxID_ANY, _(L("Decrease copies\t-")), _(L("Remove one copy of the selected object")),
[this](wxCommandEvent&){ q->decrease(); }, "delete.png");
// ui updates needs to be binded to the parent panel
if (q != nullptr)
{
q->Bind(wxEVT_UPDATE_UI,
[this](wxUpdateUIEvent& evt)
{
#if ENABLE_EXTENDED_SELECTION
int obj_idx = get_selected_object_idx();
evt.Enable((obj_idx != -1) && (model.objects[obj_idx]->instances.size() > 1));
#endif // ENABLE_EXTENDED_SELECTION
},
item_decrease->GetId());
}
return true; return true;
} }