From 15ed292c31a2af79f65bbc91ab8c5d695b362904 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 23 Dec 2024 16:09:29 +0800 Subject: [PATCH] FIX: the start button of flow ratio calibration is disenable jira: STUDIO-9338 Change-Id: I715eb87067b55968a5ffedf96e1a44a64b2bd759 --- src/slic3r/GUI/CalibrationWizardStartPage.cpp | 29 ++++++++++++------- src/slic3r/GUI/CalibrationWizardStartPage.hpp | 2 ++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 756a692db..56a05bdc1 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -300,6 +300,25 @@ void CalibrationFlowRateStartPage::on_reset_page() void CalibrationFlowRateStartPage::on_device_connected(MachineObject* obj) { + update(obj); +} + +void CalibrationFlowRateStartPage::msw_rescale() +{ + CalibrationWizardPage::msw_rescale(); + if (wxGetApp().app_config->get_language_code() == "zh-cn") { + create_bitmap(this, "cali_page_flow_introduction_CN"); + } else { + create_bitmap(this, "cali_page_flow_introduction"); + } +} + +void CalibrationFlowRateStartPage::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); @@ -333,16 +352,6 @@ void CalibrationFlowRateStartPage::on_device_connected(MachineObject* obj) } } -void CalibrationFlowRateStartPage::msw_rescale() -{ - CalibrationWizardPage::msw_rescale(); - if (wxGetApp().app_config->get_language_code() == "zh-cn") { - create_bitmap(this, "cali_page_flow_introduction_CN"); - } else { - create_bitmap(this, "cali_page_flow_introduction"); - } -} - CalibrationMaxVolumetricSpeedStartPage::CalibrationMaxVolumetricSpeedStartPage(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 97c12e36e..74c86ebf5 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp @@ -68,6 +68,8 @@ public: void on_reset_page(); void on_device_connected(MachineObject* obj); void msw_rescale() override; + + virtual void update(MachineObject *obj) override; }; class CalibrationMaxVolumetricSpeedStartPage : public CalibrationStartPage