3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 00:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed first binding for "Split to parts" menu item in ObjectList

Browse source
This commit is contained in:
YuSanka 2019-01-30 10:05:54 +01:00
parent 9ff4cb01e2
commit b6852d8bf2
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -64,12 +64,6 @@ ObjectList::ObjectList(wxWindow* parent) :
init_icons(); init_icons();
// create popup menus for object and part
create_object_popupmenu(&m_menu_object);
create_part_popupmenu(&m_menu_part);
create_sla_object_popupmenu(&m_menu_sla_object);
create_instance_popupmenu(&m_menu_instance);
// describe control behavior // describe control behavior
Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxEvent& event) { Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxEvent& event) {
selection_changed(); selection_changed();
@ -141,6 +135,15 @@ void ObjectList::create_objects_ctrl()
wxALIGN_CENTER_HORIZONTAL, wxDATAVIEW_COL_RESIZABLE); wxALIGN_CENTER_HORIZONTAL, wxDATAVIEW_COL_RESIZABLE);
} }
void ObjectList::create_popup_menus()
{
// create popup menus for object and part
create_object_popupmenu(&m_menu_object);
create_part_popupmenu(&m_menu_part);
create_sla_object_popupmenu(&m_menu_sla_object);
create_instance_popupmenu(&m_menu_instance);
}
void ObjectList::set_tooltip_for_item(const wxPoint& pt) void ObjectList::set_tooltip_for_item(const wxPoint& pt)
{ {
wxDataViewItem item; wxDataViewItem item;
@ -421,9 +424,6 @@ void ObjectList::show_context_menu()
if (multiple_selection() && selected_instances_of_same_object()) if (multiple_selection() && selected_instances_of_same_object())
{ {
wxGetApp().plater()->PopupMenu(&m_menu_instance); wxGetApp().plater()->PopupMenu(&m_menu_instance);
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(can_split_instances()); }, m_menu_item_split_instances->GetId());
return; return;
} }
@ -442,12 +442,6 @@ void ObjectList::show_context_menu()
append_menu_item_settings(menu); append_menu_item_settings(menu);
wxGetApp().plater()->PopupMenu(menu); wxGetApp().plater()->PopupMenu(menu);
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(is_splittable()); }, m_menu_item_split->GetId());
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(is_splittable()); }, m_menu_item_split_part->GetId());
} }
} }
@ -973,6 +967,9 @@ void ObjectList::create_object_popupmenu(wxMenu *menu)
// rest of a object_menu will be added later in: // rest of a object_menu will be added later in:
// - append_menu_items_add_volume() -> for "Add (volumes)" // - append_menu_items_add_volume() -> for "Add (volumes)"
// - append_menu_item_settings() -> for "Add (settings)" // - append_menu_item_settings() -> for "Add (settings)"
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(is_splittable()); }, m_menu_item_split->GetId());
} }
void ObjectList::create_sla_object_popupmenu(wxMenu *menu) void ObjectList::create_sla_object_popupmenu(wxMenu *menu)
@ -991,11 +988,17 @@ void ObjectList::create_part_popupmenu(wxMenu *menu)
// rest of a object_sla_menu will be added later in: // rest of a object_sla_menu will be added later in:
// - append_menu_item_settings() -> for "Add (settings)" // - append_menu_item_settings() -> for "Add (settings)"
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(is_splittable()); }, m_menu_item_split_part->GetId());
} }
void ObjectList::create_instance_popupmenu(wxMenu*menu) void ObjectList::create_instance_popupmenu(wxMenu*menu)
{ {
m_menu_item_split_instances = append_menu_item_instance_to_object(menu); m_menu_item_split_instances = append_menu_item_instance_to_object(menu);
wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
evt.Enable(can_split_instances()); }, m_menu_item_split_instances->GetId());
} }
wxMenu* ObjectList::create_settings_popupmenu(wxMenu *parent_menu) wxMenu* ObjectList::create_settings_popupmenu(wxMenu *parent_menu)

1
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -153,6 +153,7 @@ public:
void create_objects_ctrl(); void create_objects_ctrl();
void create_popup_menus();
wxDataViewColumn* create_objects_list_extruder_column(int extruders_count); wxDataViewColumn* create_objects_list_extruder_column(int extruders_count);
void update_objects_list_extruder_column(int extruders_count); void update_objects_list_extruder_column(int extruders_count);
// show/hide "Extruder" column for Objects List // show/hide "Extruder" column for Objects List

3
src/slic3r/GUI/MainFrame.cpp
View file

@ -22,6 +22,7 @@
#include "AppConfig.hpp" #include "AppConfig.hpp"
#include "PrintHostDialogs.hpp" #include "PrintHostDialogs.hpp"
#include "wxExtensions.hpp" #include "wxExtensions.hpp"
#include "GUI_ObjectList.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include <fstream> #include <fstream>
@ -132,6 +133,8 @@ void MainFrame::init_tabpanel()
wxGetApp().plater_ = m_plater; wxGetApp().plater_ = m_plater;
m_tabpanel->AddPage(m_plater, _(L("Plater"))); m_tabpanel->AddPage(m_plater, _(L("Plater")));
wxGetApp().obj_list()->create_popup_menus();
// The following event is emited by Tab implementation on config value change. // The following event is emited by Tab implementation on config value change.
Bind(EVT_TAB_VALUE_CHANGED, &MainFrame::on_value_changed, this); Bind(EVT_TAB_VALUE_CHANGED, &MainFrame::on_value_changed, this);