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

Show/hide the legend using a new checkbox in preview

Browse Source
This commit is contained in:
Yuri D'Elia 2019-06-22 17:38:14 +02:00 committed by Vojtěch Bubník
parent 0fb81e6cda
commit 07480edc50
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,6 +176,7 @@ Preview::Preview(
, m_checkbox_retractions(nullptr) , m_checkbox_retractions(nullptr)
, m_checkbox_unretractions(nullptr) , m_checkbox_unretractions(nullptr)
, m_checkbox_shells(nullptr) , m_checkbox_shells(nullptr)
, m_checkbox_legend(nullptr)
, m_config(config) , m_config(config)
, m_process(process) , m_process(process)
, m_gcode_preview_data(gcode_preview_data) , m_gcode_preview_data(gcode_preview_data)
@ -252,6 +253,9 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view
m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _(L("Unretractions"))); m_checkbox_unretractions = new wxCheckBox(this, wxID_ANY, _(L("Unretractions")));
m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _(L("Shells"))); m_checkbox_shells = new wxCheckBox(this, wxID_ANY, _(L("Shells")));
m_checkbox_legend = new wxCheckBox(this, wxID_ANY, _(L("Legend")));
m_checkbox_legend->SetValue(true);
wxBoxSizer* top_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* top_sizer = new wxBoxSizer(wxHORIZONTAL);
top_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0); top_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0);
top_sizer->Add(m_double_slider_sizer, 0, wxEXPAND, 0); top_sizer->Add(m_double_slider_sizer, 0, wxEXPAND, 0);
@ -270,6 +274,8 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view
bottom_sizer->Add(m_checkbox_unretractions, 0, wxEXPAND | wxALL, 5); bottom_sizer->Add(m_checkbox_unretractions, 0, wxEXPAND | wxALL, 5);
bottom_sizer->AddSpacer(10); bottom_sizer->AddSpacer(10);
bottom_sizer->Add(m_checkbox_shells, 0, wxEXPAND | wxALL, 5); bottom_sizer->Add(m_checkbox_shells, 0, wxEXPAND | wxALL, 5);
bottom_sizer->AddSpacer(20);
bottom_sizer->Add(m_checkbox_legend, 0, wxEXPAND | wxALL, 5);
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(top_sizer, 1, wxALL | wxEXPAND, 0); main_sizer->Add(top_sizer, 1, wxALL | wxEXPAND, 0);
@ -442,6 +448,7 @@ void Preview::bind_event_handlers()
m_checkbox_retractions->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_retractions, this); m_checkbox_retractions->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_retractions, this);
m_checkbox_unretractions->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_unretractions, this); m_checkbox_unretractions->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_unretractions, this);
m_checkbox_shells->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_shells, this); m_checkbox_shells->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_shells, this);
m_checkbox_legend->Bind(wxEVT_CHECKBOX, &Preview::on_checkbox_legend, this);
} }
void Preview::unbind_event_handlers() void Preview::unbind_event_handlers()
@ -453,6 +460,7 @@ void Preview::unbind_event_handlers()
m_checkbox_retractions->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_retractions, this); m_checkbox_retractions->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_retractions, this);
m_checkbox_unretractions->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_unretractions, this); m_checkbox_unretractions->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_unretractions, this);
m_checkbox_shells->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_shells, this); m_checkbox_shells->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_shells, this);
m_checkbox_legend->Unbind(wxEVT_CHECKBOX, &Preview::on_checkbox_legend, this);
} }
void Preview::show_hide_ui_elements(const std::string& what) void Preview::show_hide_ui_elements(const std::string& what)
@ -464,6 +472,7 @@ void Preview::show_hide_ui_elements(const std::string& what)
m_checkbox_retractions->Enable(enable); m_checkbox_retractions->Enable(enable);
m_checkbox_unretractions->Enable(enable); m_checkbox_unretractions->Enable(enable);
m_checkbox_shells->Enable(enable); m_checkbox_shells->Enable(enable);
m_checkbox_legend->Enable(enable);
enable = (what != "none"); enable = (what != "none");
m_label_view_type->Enable(enable); m_label_view_type->Enable(enable);
@ -476,6 +485,7 @@ void Preview::show_hide_ui_elements(const std::string& what)
m_checkbox_retractions->Show(visible); m_checkbox_retractions->Show(visible);
m_checkbox_unretractions->Show(visible); m_checkbox_unretractions->Show(visible);
m_checkbox_shells->Show(visible); m_checkbox_shells->Show(visible);
m_checkbox_legend->Show(visible);
m_label_view_type->Show(visible); m_label_view_type->Show(visible);
m_choice_view_type->Show(visible); m_choice_view_type->Show(visible);
} }
@ -542,6 +552,12 @@ void Preview::on_checkbox_shells(wxCommandEvent& evt)
refresh_print(); refresh_print();
} }
void Preview::on_checkbox_legend(wxCommandEvent& evt)
{
m_canvas->enable_legend_texture(m_checkbox_legend->IsChecked());
m_canvas_widget->Refresh();
}
void Preview::update_view_type() void Preview::update_view_type()
{ {
const DynamicPrintConfig& config = wxGetApp().preset_bundle->project_config; const DynamicPrintConfig& config = wxGetApp().preset_bundle->project_config;

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

@ -80,6 +80,7 @@ class Preview : public wxPanel
wxCheckBox* m_checkbox_retractions; wxCheckBox* m_checkbox_retractions;
wxCheckBox* m_checkbox_unretractions; wxCheckBox* m_checkbox_unretractions;
wxCheckBox* m_checkbox_shells; wxCheckBox* m_checkbox_shells;
wxCheckBox* m_checkbox_legend;
DynamicPrintConfig* m_config; DynamicPrintConfig* m_config;
BackgroundSlicingProcess* m_process; BackgroundSlicingProcess* m_process;
@ -147,6 +148,7 @@ private:
void on_checkbox_retractions(wxCommandEvent& evt); void on_checkbox_retractions(wxCommandEvent& evt);
void on_checkbox_unretractions(wxCommandEvent& evt); void on_checkbox_unretractions(wxCommandEvent& evt);
void on_checkbox_shells(wxCommandEvent& evt); void on_checkbox_shells(wxCommandEvent& evt);
void on_checkbox_legend(wxCommandEvent& evt);
// Create/Update/Reset double slider on 3dPreview // Create/Update/Reset double slider on 3dPreview
void create_double_slider(); void create_double_slider();