From efa80db8de519e29894f19ba08161b7cf36eab77 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Thu, 4 Aug 2022 10:49:49 +0800 Subject: [PATCH] FIX: fix spell error of spaghetti Change-Id: If36910fc76e5e6cbc6629d4f015fdef561ce1dea --- src/slic3r/GUI/PrintOptionsDialog.cpp | 48 +++++++++++++-------------- src/slic3r/GUI/PrintOptionsDialog.hpp | 8 ++--- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index aee32515d..eef87fa18 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -34,18 +34,18 @@ PrintOptionsDialog::PrintOptionsDialog(wxWindow* parent) evt.Skip(); }); - m_cb_spaqhetti->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) { - update_spaqhetti(); + m_cb_spaghetti->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent& evt) { + update_spaghetti(); if (obj) { - obj->command_xcam_control_spaghetti_detector(m_cb_spaqhetti->GetValue(), m_cb_spaqhetti_print_halt->GetValue()); + obj->command_xcam_control_spaghetti_detector(m_cb_spaghetti->GetValue(), m_cb_spaghetti_print_halt->GetValue()); } evt.Skip(); }); - m_cb_spaqhetti_print_halt->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent&evt) { + m_cb_spaghetti_print_halt->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent&evt) { if (obj) { - obj->command_xcam_control_spaghetti_detector(m_cb_spaqhetti->GetValue(), m_cb_spaqhetti_print_halt->GetValue()); + obj->command_xcam_control_spaghetti_detector(m_cb_spaghetti->GetValue(), m_cb_spaghetti_print_halt->GetValue()); } evt.Skip(); }); @@ -60,15 +60,15 @@ void PrintOptionsDialog::on_dpi_changed(const wxRect &suggested_rect) Fit(); } -void PrintOptionsDialog::update_spaqhetti() +void PrintOptionsDialog::update_spaghetti() { - if (m_cb_spaqhetti->GetValue()) { - m_cb_spaqhetti_print_halt->Enable(); - text_spaqhetti_print_halt->Enable(); + if (m_cb_spaghetti->GetValue()) { + m_cb_spaghetti_print_halt->Enable(); + text_spaghetti_print_halt->Enable(); } else { - m_cb_spaqhetti_print_halt->Disable(); - text_spaqhetti_print_halt->Disable(); + m_cb_spaghetti_print_halt->Disable(); + text_spaghetti_print_halt->Disable(); } } @@ -76,10 +76,10 @@ void PrintOptionsDialog::update_options(MachineObject *obj_) { if (!obj_) return; this->Freeze(); - m_cb_spaqhetti->SetValue(obj_->xcam_spaghetti_detector); - m_cb_spaqhetti_print_halt->SetValue(obj_->xcam_spaghetti_print_halt); + m_cb_spaghetti->SetValue(obj_->xcam_spaghetti_detector); + m_cb_spaghetti_print_halt->SetValue(obj_->xcam_spaghetti_print_halt); m_cb_first_layer->SetValue(obj_->xcam_first_layer_inspector); - update_spaqhetti(); + update_spaghetti(); this->Thaw(); } @@ -87,21 +87,21 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) { auto sizer = new wxBoxSizer(wxVERTICAL); auto line_sizer = new wxBoxSizer(wxHORIZONTAL); - m_cb_spaqhetti = new CheckBox(parent); - auto text_spaqhetti = new wxStaticText(parent, wxID_ANY, _L("Spaqhetti Detection")); - text_spaqhetti->SetFont(Label::Body_14); + m_cb_spaghetti = new CheckBox(parent); + auto text_spaghetti = new wxStaticText(parent, wxID_ANY, _L("spaghetti Detection")); + text_spaghetti->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); - line_sizer->Add(m_cb_spaqhetti, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); - line_sizer->Add(text_spaqhetti, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); + line_sizer->Add(m_cb_spaghetti, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); + line_sizer->Add(text_spaghetti, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); sizer->Add(line_sizer, 0, wxEXPAND | wxALL, FromDIP(5)); line_sizer = new wxBoxSizer(wxHORIZONTAL); - m_cb_spaqhetti_print_halt = new CheckBox(parent); - text_spaqhetti_print_halt = new wxStaticText(parent, wxID_ANY, _L("Stop printing when Spaqhetti detected")); - text_spaqhetti_print_halt->SetFont(Label::Body_12); + m_cb_spaghetti_print_halt = new CheckBox(parent); + text_spaghetti_print_halt = new wxStaticText(parent, wxID_ANY, _L("Stop printing when spaghetti detected")); + text_spaghetti_print_halt->SetFont(Label::Body_12); line_sizer->Add(FromDIP(30), 0, 0, 0); - line_sizer->Add(m_cb_spaqhetti_print_halt, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); - line_sizer->Add(text_spaqhetti_print_halt, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); + line_sizer->Add(m_cb_spaghetti_print_halt, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); + line_sizer->Add(text_spaghetti_print_halt, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); sizer->Add(line_sizer, 0, wxEXPAND | wxALL , 0); diff --git a/src/slic3r/GUI/PrintOptionsDialog.hpp b/src/slic3r/GUI/PrintOptionsDialog.hpp index 668a99268..21fa1843b 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.hpp +++ b/src/slic3r/GUI/PrintOptionsDialog.hpp @@ -22,16 +22,16 @@ class PrintOptionsDialog : public DPIDialog protected: // settings CheckBox* m_cb_first_layer; - CheckBox* m_cb_spaqhetti; - CheckBox* m_cb_spaqhetti_print_halt; - wxStaticText* text_spaqhetti_print_halt; + CheckBox* m_cb_spaghetti; + CheckBox* m_cb_spaghetti_print_halt; + wxStaticText* text_spaghetti_print_halt; wxBoxSizer* create_settings_group(wxWindow* parent); public: PrintOptionsDialog(wxWindow* parent); ~PrintOptionsDialog(); void on_dpi_changed(const wxRect &suggested_rect) override; - void update_spaqhetti(); + void update_spaghetti(); MachineObject *obj { nullptr };