From c04979495ba6ca15efc1266bb46f77ba43ab5696 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Tue, 27 Jun 2023 17:01:39 +0800 Subject: [PATCH] NEW: add calibration wiki pages Change-Id: Ib931b187e0e6629fe387a8b25bc8b9adc964de86 Signed-off-by: Stone Li --- src/slic3r/GUI/CalibrationPanel.cpp | 32 ++++++++++++++-------------- src/slic3r/GUI/CalibrationPanel.hpp | 14 ++++-------- src/slic3r/GUI/CalibrationWizard.cpp | 20 +++++++++++++++++ src/slic3r/GUI/CalibrationWizard.hpp | 11 +++++----- src/slic3r/GUI/DeviceManager.cpp | 2 +- 5 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 2cae301c7f..62dc3c7144 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -15,18 +15,18 @@ namespace Slic3r { namespace GUI { wxDEFINE_EVENT(EVT_FINISHED_UPDATE_MLIST, wxCommandEvent); wxDEFINE_EVENT(EVT_UPDATE_USER_MLIST, wxCommandEvent); -wxString get_calibration_type_name(CalibrationType cali_type) +wxString get_calibration_type_name(CalibMode cali_mode) { - switch (cali_type) { - case CalibrationType::CALI_TYPE_PA: + switch (cali_mode) { + case CalibMode::Calib_PA_Line: return _L("Pressure Adavance"); - case CalibrationType::CALI_TYPE_FLOW: + case CalibMode::Calib_Flow_Rate: return _L("Flow Rate"); - case CalibrationType::CALI_TYPE_VOLUMETRIC: + case CalibMode::Calib_Vol_speed_Tower: return _L("Max Volumetric Speed"); - case CalibrationType::CALI_TYPE_TEMPERATURE: + case CalibMode::Calib_Temp_Tower: return _L("Temperature"); - case CalibrationType::CALI_TYPE_RETRACTION: + case CalibMode::Calib_Retraction_tower: return _L("Retraction"); default: return ""; @@ -468,23 +468,23 @@ void CalibrationPanel::init_tabpanel() { m_tabpanel = new Tabbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, sizer_side_tools, wxNB_LEFT | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME); m_tabpanel->SetBackgroundColour(*wxWHITE); - m_cali_panels[(int)CalibrationType::CALI_TYPE_PA] = new PressureAdvanceWizard(m_tabpanel); - m_cali_panels[(int)CalibrationType::CALI_TYPE_FLOW] = new FlowRateWizard(m_tabpanel); - m_cali_panels[(int)CalibrationType::CALI_TYPE_VOLUMETRIC] = new MaxVolumetricSpeedWizard(m_tabpanel); - m_cali_panels[(int)CalibrationType::CALI_TYPE_TEMPERATURE] = new TemperatureWizard(m_tabpanel); - m_cali_panels[(int)CalibrationType::CALI_TYPE_RETRACTION] = new RetractionWizard(m_tabpanel); + m_cali_panels[0] = new PressureAdvanceWizard(m_tabpanel); + m_cali_panels[1] = new FlowRateWizard(m_tabpanel); + m_cali_panels[2] = new MaxVolumetricSpeedWizard(m_tabpanel); + m_cali_panels[3] = new TemperatureWizard(m_tabpanel); + m_cali_panels[4] = new RetractionWizard(m_tabpanel); - for (int i = 0; i < (int)CalibrationType::CALI_MAX_COUNT; i++) { + for (int i = 0; i < (int)CALI_MODE_COUNT; i++) { bool selected = false; if (i == 0) selected = true; m_tabpanel->AddPage(m_cali_panels[i], - get_calibration_type_name(static_cast(i)), + get_calibration_type_name(m_cali_panels[i]->get_calibration_mode()), "", selected); } - for (int i = 0; i < (int)CalibrationType::CALI_MAX_COUNT; i++) + for (int i = 0; i < (int)CALI_MODE_COUNT; i++) m_tabpanel->SetPageImage(i, ""); m_tabpanel->Bind(wxEVT_BOOKCTRL_PAGE_CHANGED, [this](wxBookCtrlEvent&) { @@ -514,7 +514,7 @@ void CalibrationPanel::update_print_error_info(int code, std::string msg, std::s } void CalibrationPanel::update_all() { - for (int i = 0; i < (int)CalibrationType::CALI_MAX_COUNT; i++) { + for (int i = 0; i < (int)CALI_MODE_COUNT; i++) { m_cali_panels[i]->update_printer(); if (m_cali_panels[i]->IsShown()) m_cali_panels[i]->update_print_progress(); diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp index 81d36d21bd..72bf8951fd 100644 --- a/src/slic3r/GUI/CalibrationPanel.hpp +++ b/src/slic3r/GUI/CalibrationPanel.hpp @@ -14,16 +14,10 @@ namespace Slic3r { namespace GUI { #define SELECT_MACHINE_REMIND wxColour(255,111,0) #define SELECT_MACHINE_LIGHT_GREEN wxColour(219, 253, 231) -enum class CalibrationType { - CALI_TYPE_PA = 0, - CALI_TYPE_FLOW, - CALI_TYPE_VOLUMETRIC, - CALI_TYPE_TEMPERATURE, - CALI_TYPE_RETRACTION, - CALI_MAX_COUNT, -}; +#define CALI_MODE_COUNT 5 -wxString get_calibration_type_name(CalibrationType cali_type); + +wxString get_calibration_type_name(CalibMode cali_mode); class MObjectPanel : public wxPanel { @@ -125,7 +119,7 @@ private: Tabbook* m_tabpanel{ nullptr }; SelectMObjectPopup m_mobjectlist_popup; - CalibrationWizard* m_cali_panels[(int)CalibrationType::CALI_MAX_COUNT]; + CalibrationWizard* m_cali_panels[CALI_MODE_COUNT]; wxTimer* m_refresh_timer = nullptr; }; diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index f03192d772..b36aaf61d0 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -34,6 +34,24 @@ static bool is_high_end_type(MachineObject* obj) { return false; } +wxString get_calibration_wiki_page(CalibMode cali_mode) +{ + switch (cali_mode) { + case CalibMode::Calib_PA_Line: + return wxString("https://wiki.bambulab.com/en/software/bambu-studio/calibration_pa"); + case CalibMode::Calib_Flow_Rate: + return wxString("https://wiki.bambulab.com/en/software/bambu-studio/calibration_flow_rate"); + case CalibMode::Calib_Vol_speed_Tower: + return wxString("https://wiki.bambulab.com/en/software/bambu-studio/calibration_volumetric"); + case CalibMode::Calib_Temp_Tower: + return wxString("https://wiki.bambulab.com/en/software/bambu-studio/calibration_temperature"); + case CalibMode::Calib_Retraction_tower: + return wxString("https://wiki.bambulab.com/en/software/bambu-studio/calibration_retraction"); + default: + return ""; + } +} + FilamentComboBox::FilamentComboBox(wxWindow* parent, const wxPoint& pos, const wxSize& size) : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL) { @@ -133,6 +151,8 @@ CalibrationWizard::CalibrationWizard(wxWindow* parent, CalibMode mode, wxWindowI : wxPanel(parent, id, pos, size, style) , m_mode(mode) { + m_wiki_url = get_calibration_wiki_page(m_mode); + SetBackgroundColour(wxColour(0xEEEEEE)); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp index f327d0b87d..6f35bdc726 100644 --- a/src/slic3r/GUI/CalibrationWizard.hpp +++ b/src/slic3r/GUI/CalibrationWizard.hpp @@ -21,6 +21,10 @@ enum FilamentSelectMode { FSMCheckBoxMode, FSMRadioMode }; + + +wxString get_calibration_wiki_page(CalibMode cali_mode); + class FilamentComboBox : public wxPanel { public: @@ -99,6 +103,8 @@ private: ScalableBitmap m_bitmap_abort_disable; protected: + wxString m_wiki_url; + std::map m_printer_calib_infos; bool is_between_start_and_runing = false; CalibMode m_mode; @@ -243,7 +249,6 @@ private: // start page CalibrationWizardPage* m_page0{ nullptr }; - std::string m_wiki_url; // preset page CalibrationWizardPage* m_page1{ nullptr }; @@ -292,7 +297,6 @@ protected: private: // start page CalibrationWizardPage* m_page0{ nullptr }; - std::string m_wiki_url; // preset page CalibrationWizardPage* m_page1{ nullptr }; @@ -352,7 +356,6 @@ protected: private: // start page CalibrationWizardPage* m_page0; - std::string m_wiki_url; // preset page CalibrationWizardPage* m_page1; @@ -386,7 +389,6 @@ protected: private: // start page CalibrationWizardPage* m_page0; - std::string m_wiki_url; // preset page CalibrationWizardPage* m_page1; @@ -418,7 +420,6 @@ protected: private: // start page CalibrationWizardPage* m_page0; - std::string m_wiki_url; // preset page CalibrationWizardPage* m_page1; diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index f5afc72a73..324298e1da 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -3988,7 +3988,7 @@ int MachineObject::parse_json(std::string payload) if (j.contains("upgrade")) { if (j["upgrade"].contains("command")) { if (j["upgrade"]["command"].get() == "upgrade_confirm") { - this->upgrade_display_state == UpgradingInProgress; + this->upgrade_display_state = UpgradingInProgress; upgrade_display_hold_count = HOLD_COUNT_MAX; BOOST_LOG_TRIVIAL(info) << "ack of upgrade_confirm"; }