mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-12 17:27:52 -06:00
Merged with dev
This commit is contained in:
parent
d934b63424
commit
fe3b92870f
90 changed files with 3310 additions and 1748 deletions
|
@ -9,13 +9,15 @@ class wxArrayString;
|
|||
class wxMenu;
|
||||
class wxDataViewEvent;
|
||||
class wxKeyEvent;
|
||||
class wxControl;
|
||||
class wxGLCanvas;
|
||||
class wxBitmap;
|
||||
|
||||
namespace Slic3r {
|
||||
class ModelObject;
|
||||
class Model;
|
||||
|
||||
namespace GUI {
|
||||
//class wxGLCanvas;
|
||||
|
||||
enum ogGroup{
|
||||
ogFrequentlyChangingParameters,
|
||||
|
@ -44,6 +46,9 @@ struct OBJECT_PARAMETERS
|
|||
double slab_z = 0.0;
|
||||
};
|
||||
|
||||
typedef std::map<std::string, wxBitmap> t_category_icon;
|
||||
inline t_category_icon& get_category_icon();
|
||||
|
||||
void add_collapsible_panes(wxWindow* parent, wxBoxSizer* sizer);
|
||||
void add_objects_list(wxWindow* parent, wxBoxSizer* sizer);
|
||||
void add_object_settings(wxWindow* parent, wxBoxSizer* sizer);
|
||||
|
@ -66,16 +71,17 @@ void set_object_count(int idx, int count);
|
|||
void unselect_objects();
|
||||
// Select current object in the list on c++ side
|
||||
void select_current_object(int idx);
|
||||
// Select current volume in the list on c++ side
|
||||
void select_current_volume(int idx, int vol_idx);
|
||||
// Remove objects/sub-object from the list
|
||||
void remove();
|
||||
|
||||
//void create_double_slider(wxWindow* parent, wxControl* slider);
|
||||
|
||||
void object_ctrl_selection_changed();
|
||||
void object_ctrl_context_menu();
|
||||
void object_ctrl_key_event(wxKeyEvent& event);
|
||||
void object_ctrl_item_value_change(wxDataViewEvent& event);
|
||||
void show_context_menu();
|
||||
bool is_splittable_object(const bool split_part);
|
||||
|
||||
void init_mesh_icons();
|
||||
void set_event_object_selection_changed(const int& event);
|
||||
|
@ -87,13 +93,14 @@ void set_objects_from_model(Model &model);
|
|||
bool is_parts_changed();
|
||||
bool is_part_settings_changed();
|
||||
|
||||
void load_part( wxWindow* parent, ModelObject* model_object,
|
||||
void load_part( ModelObject* model_object,
|
||||
wxArrayString& part_names, const bool is_modifier);
|
||||
|
||||
void load_lambda(wxWindow* parent, ModelObject* model_object,
|
||||
wxArrayString& part_names, const bool is_modifier);
|
||||
void load_lambda( ModelObject* model_object,
|
||||
wxArrayString& part_names, const bool is_modifier);
|
||||
void load_lambda( const std::string& type_name);
|
||||
|
||||
void on_btn_load(wxWindow* parent, bool is_modifier = false, bool is_lambda = false);
|
||||
void on_btn_load(bool is_modifier = false, bool is_lambda = false);
|
||||
void on_btn_del();
|
||||
void on_btn_split(const bool split_part);
|
||||
void on_btn_move_up();
|
||||
|
@ -126,6 +133,15 @@ void on_drop(wxDataViewEvent &event);
|
|||
// update extruder column for objects_ctrl according to extruders count
|
||||
void update_objects_list_extruder_column(int extruders_count);
|
||||
|
||||
// Create/Update/Reset double slider on 3dPreview
|
||||
void create_double_slider(wxWindow* parent, wxBoxSizer* sizer, wxGLCanvas* canvas);
|
||||
void update_double_slider(bool force_sliders_full_range);
|
||||
void reset_double_slider();
|
||||
// update DoubleSlider after keyDown in canvas
|
||||
void update_double_slider_from_canvas(wxKeyEvent& event);
|
||||
|
||||
void show_manipulation_sizer(const bool is_simple_mode);
|
||||
|
||||
} //namespace GUI
|
||||
} //namespace Slic3r
|
||||
#endif //slic3r_GUI_ObjectParts_hpp_
|
Loading…
Add table
Add a link
Reference in a new issue