diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 5354372de..8a17f16b4 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -651,6 +651,9 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt) else if (action == CaliPageActionType::CALI_ACTION_NEXT) { show_step(m_curr_step->next); } + else if (action == CaliPageActionType::CALI_ACTION_CALI_NEXT) { + show_step(m_curr_step->next); + } else if (action == CaliPageActionType::CALI_ACTION_PREV) { show_step(m_curr_step->prev); } diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index 64b08869d..817cf9944 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -217,7 +217,7 @@ void CalibrationCaliPage::update(MachineObject* obj) } else { assert(false); } - m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_NEXT, enable_cali); + m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali); } else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) { if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) { diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index 31ca59363..31d25b75d 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -539,7 +539,7 @@ CaliPageActionPanel::CaliPageActionPanel(wxWindow* parent, m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI)); } else if (page_type == CaliPageType::CALI_PAGE_CALI) { - m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_NEXT)); + m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI_NEXT)); } else if (page_type == CaliPageType::CALI_PAGE_COARSE_SAVE) { m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_FLOW_COARSE_SAVE)); @@ -560,7 +560,7 @@ CaliPageActionPanel::CaliPageActionPanel(wxWindow* parent, m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI)); } else if (page_type == CaliPageType::CALI_PAGE_CALI) { - m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_NEXT)); + m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI_NEXT)); } else if (page_type == CaliPageType::CALI_PAGE_COMMON_SAVE) { m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_COMMON_SAVE));