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

Preview class refactoring: Moved initialization of member variables

Browse source 
to header.
This commit is contained in:
Vojtech Bubnik 2020-12-02 11:38:10 +01:00
parent fa24d598a7
commit 89ff8eef10
2 changed files with 15 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -169,27 +169,11 @@ void View3D::render()
Preview::Preview( Preview::Preview(
wxWindow* parent, Model* model, DynamicPrintConfig* config, wxWindow* parent, Model* model, DynamicPrintConfig* config,
BackgroundSlicingProcess* process, GCodeProcessor::Result* gcode_result, std::function<void()> schedule_background_process_func) BackgroundSlicingProcess* process, GCodeProcessor::Result* gcode_result, std::function<void()> schedule_background_process_func)
: m_canvas_widget(nullptr) : m_config(config)
, m_canvas(nullptr)
, m_left_sizer(nullptr)
, m_layers_slider_sizer(nullptr)
, m_bottom_toolbar_panel(nullptr)
, m_label_view_type(nullptr)
, m_choice_view_type(nullptr)
, m_label_show(nullptr)
, m_combochecklist_features(nullptr)
, m_combochecklist_features_pos(0)
, m_combochecklist_options(nullptr)
, m_config(config)
, m_process(process) , m_process(process)
, m_gcode_result(gcode_result) , m_gcode_result(gcode_result)
, m_number_extruders(1)
, m_preferred_color_mode("feature") , m_preferred_color_mode("feature")
, m_loaded(false)
, m_schedule_background_process(schedule_background_process_func) , m_schedule_background_process(schedule_background_process_func)
#ifdef __linux__
, m_volumes_cleanup_required(false)
#endif // __linux__
{ {
if (init(parent, model)) if (init(parent, model))
load_print(); load_print();

28
src/slic3r/GUI/GUI_Preview.hpp
View file

@ -76,17 +76,17 @@ private:
class Preview : public wxPanel class Preview : public wxPanel
{ {
wxGLCanvas* m_canvas_widget; wxGLCanvas* m_canvas_widget { nullptr };
GLCanvas3D* m_canvas; GLCanvas3D* m_canvas { nullptr };
wxBoxSizer* m_left_sizer; wxBoxSizer* m_left_sizer { nullptr };
wxBoxSizer* m_layers_slider_sizer; wxBoxSizer* m_layers_slider_sizer { nullptr };
wxPanel* m_bottom_toolbar_panel; wxPanel* m_bottom_toolbar_panel { nullptr };
wxStaticText* m_label_view_type; wxStaticText* m_label_view_type { nullptr };
wxChoice* m_choice_view_type; wxChoice* m_choice_view_type { nullptr };
wxStaticText* m_label_show; wxStaticText* m_label_show { nullptr };
wxComboCtrl* m_combochecklist_features; wxComboCtrl* m_combochecklist_features { nullptr };
size_t m_combochecklist_features_pos; size_t m_combochecklist_features_pos { 0 };
wxComboCtrl* m_combochecklist_options; wxComboCtrl* m_combochecklist_options { nullptr };
DynamicPrintConfig* m_config; DynamicPrintConfig* m_config;
BackgroundSlicingProcess* m_process; BackgroundSlicingProcess* m_process;
@ -95,16 +95,16 @@ class Preview : public wxPanel
#ifdef __linux__ #ifdef __linux__
// We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955. // We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955.
// So we are applying a workaround here. // So we are applying a workaround here.
bool m_volumes_cleanup_required; bool m_volumes_cleanup_required { false };
#endif /* __linux__ */ #endif /* __linux__ */
// Calling this function object forces Plater::schedule_background_process. // Calling this function object forces Plater::schedule_background_process.
std::function<void()> m_schedule_background_process; std::function<void()> m_schedule_background_process;
unsigned int m_number_extruders; unsigned int m_number_extruders { 1 };
std::string m_preferred_color_mode; std::string m_preferred_color_mode;
bool m_loaded; bool m_loaded { false };
DoubleSlider::Control* m_layers_slider{ nullptr }; DoubleSlider::Control* m_layers_slider{ nullptr };
DoubleSlider::Control* m_moves_slider{ nullptr }; DoubleSlider::Control* m_moves_slider{ nullptr };