3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: modify the flow rate cali button type

Browse source 
Change-Id: I7aa1254564c120e93a104065971e7c1626785411
(cherry picked from commit 29385e71d00d264e2aaf6cf6181156d6ed9f6bc1)
This commit is contained in:
zhimin.zeng 2023-07-07 20:47:49 +08:00 • committed by Lane.Wei
parent a93d09cc30
commit d304ee8717
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -651,6 +651,9 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
else if (action == CaliPageActionType::CALI_ACTION_NEXT) { else if (action == CaliPageActionType::CALI_ACTION_NEXT) {
show_step(m_curr_step->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) { else if (action == CaliPageActionType::CALI_ACTION_PREV) {
show_step(m_curr_step->prev); show_step(m_curr_step->prev);
} }

2
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View file

@ -217,7 +217,7 @@ void CalibrationCaliPage::update(MachineObject* obj)
} else { } else {
assert(false); 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) { else if (m_cali_mode == CalibMode::Calib_Vol_speed_Tower) {
if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) { if (get_obj_calibration_mode(obj) == m_cali_mode && obj->is_printing_finished()) {

4
src/slic3r/GUI/CalibrationWizardPage.cpp
View file

@ -539,7 +539,7 @@ CaliPageActionPanel::CaliPageActionPanel(wxWindow* parent,
m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI)); m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI));
} }
else if (page_type == CaliPageType::CALI_PAGE_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) { else if (page_type == CaliPageType::CALI_PAGE_COARSE_SAVE) {
m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_FLOW_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)); m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_CALI));
} }
else if (page_type == CaliPageType::CALI_PAGE_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) { else if (page_type == CaliPageType::CALI_PAGE_COMMON_SAVE) {
m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_COMMON_SAVE)); m_action_btns.push_back(new CaliPageButton(btn_parent, CaliPageActionType::CALI_ACTION_COMMON_SAVE));