From e84a93485aef376a1fbe8530fd5a2064fd4908c6 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 27 Nov 2024 18:00:24 +0800 Subject: [PATCH] FIX: Dynamic flow button is grayed out when connected printer github: 5323 Change-Id: Ib45517dba1d7db675590c3df8d51b018bf2eabdf --- src/slic3r/GUI/CalibrationWizardStartPage.cpp | 31 ++++++++++++------- src/slic3r/GUI/CalibrationWizardStartPage.hpp | 2 ++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index a932d1be3..756a692db 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -146,6 +146,26 @@ void CalibrationPAStartPage::on_reset_page() void CalibrationPAStartPage::on_device_connected(MachineObject* obj) { + update(obj); +} + +void CalibrationPAStartPage::msw_rescale() +{ + CalibrationWizardPage::msw_rescale(); + m_help_panel->msw_rescale(); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + create_bitmap(this, "cali_page_before_pa_CN", "cali_page_after_pa_CN"); + } else { + create_bitmap(this, "cali_page_before_pa", "cali_page_after_pa"); + } +} + +void CalibrationPAStartPage::update(MachineObject *obj) +{ + if (!obj) + return; + curr_obj = obj; + //enable all button m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_MANAGE_RESULT, true); m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_AUTO_CALI, true); @@ -186,17 +206,6 @@ void CalibrationPAStartPage::on_device_connected(MachineObject* obj) } } -void CalibrationPAStartPage::msw_rescale() -{ - CalibrationWizardPage::msw_rescale(); - m_help_panel->msw_rescale(); - if (wxGetApp().app_config->get_language_code() == "zh-cn") { - create_bitmap(this, "cali_page_before_pa_CN", "cali_page_after_pa_CN"); - } else { - create_bitmap(this, "cali_page_before_pa", "cali_page_after_pa"); - } -} - CalibrationFlowRateStartPage::CalibrationFlowRateStartPage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : CalibrationStartPage(parent, id, pos, size, style) { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.hpp b/src/slic3r/GUI/CalibrationWizardStartPage.hpp index 0e893bce1..97c12e36e 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp @@ -51,6 +51,8 @@ public: void on_reset_page(); void on_device_connected(MachineObject* obj); void msw_rescale() override; + + virtual void update(MachineObject *obj) override; }; class CalibrationFlowRateStartPage : public CalibrationStartPage