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

FIX: show sending progress bar & fix a crash

Browse source 
Change-Id: If8d0cd018aa842410c663cd23a2a092caa41384f
(cherry picked from commit 1c581b95f22512c8367ac26fc74f3a764b15e45d)
This commit is contained in:
liz.li 2023-07-04 11:19:49 +08:00 • committed by Lane.Wei
parent 289dec3997
commit 8f1c289d42
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -616,7 +616,6 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
else if (action == CaliPageActionType::CALI_ACTION_CALI) { else if (action == CaliPageActionType::CALI_ACTION_CALI) {
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) { if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
on_cali_start(); on_cali_start();
// show next step when print job is sending finished.
show_step(m_curr_step->next); show_step(m_curr_step->next);
} }
else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) {
@ -628,7 +627,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
// set next step page // set next step page
m_curr_step->chain(cali_fine_step); m_curr_step->chain(cali_fine_step);
} }
show_step(m_curr_step->next); // automatically jump to next step when print job is sending finished.
} }
else { else {
on_cali_start(); on_cali_start();
@ -644,7 +643,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
return; return;
} }
on_cali_start(CaliPresetStage::CALI_MANUAL_STAGE_2, new_flow_ratio); on_cali_start(CaliPresetStage::CALI_MANUAL_STAGE_2, new_flow_ratio);
show_step(m_curr_step->next); // automatically jump to next step when print job is sending finished.
} }
} }
else if (action == CaliPageActionType::CALI_ACTION_FLOW_SAVE) { else if (action == CaliPageActionType::CALI_ACTION_FLOW_SAVE) {

6
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View file

@ -670,10 +670,8 @@ void CalibrationPresetPage::create_page(wxWindow* parent)
m_top_sizer->Add(m_step_panel, 0, wxEXPAND, 0); m_top_sizer->Add(m_step_panel, 0, wxEXPAND, 0);
if (m_cali_mode == CalibMode::Calib_Flow_Rate) { m_cali_stage_panel = new CaliPresetCaliStagePanel(parent);
m_cali_stage_panel = new CaliPresetCaliStagePanel(parent); m_top_sizer->Add(m_cali_stage_panel, 0);
m_top_sizer->Add(m_cali_stage_panel, 0);
}
m_selection_panel = new wxPanel(parent); m_selection_panel = new wxPanel(parent);
create_selection_panel(m_selection_panel); create_selection_panel(m_selection_panel);