From 8f1c289d42744007d380e2fda91b2f000ec010bc Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Tue, 4 Jul 2023 11:19:49 +0800 Subject: [PATCH] FIX: show sending progress bar & fix a crash Change-Id: If8d0cd018aa842410c663cd23a2a092caa41384f (cherry picked from commit 1c581b95f22512c8367ac26fc74f3a764b15e45d) --- src/slic3r/GUI/CalibrationWizard.cpp | 5 ++--- src/slic3r/GUI/CalibrationWizardPresetPage.cpp | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 36e25849b..c264884d6 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -616,7 +616,6 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt) else if (action == CaliPageActionType::CALI_ACTION_CALI) { if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) { on_cali_start(); - // show next step when print job is sending finished. show_step(m_curr_step->next); } else if (m_cali_method == CalibrationMethod::CALI_METHOD_MANUAL) { @@ -628,7 +627,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt) // set next step page 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 { on_cali_start(); @@ -644,7 +643,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt) return; } 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) { diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 1b30b2e1b..356435b97 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -670,10 +670,8 @@ void CalibrationPresetPage::create_page(wxWindow* parent) 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_top_sizer->Add(m_cali_stage_panel, 0); - } + m_cali_stage_panel = new CaliPresetCaliStagePanel(parent); + m_top_sizer->Add(m_cali_stage_panel, 0); m_selection_panel = new wxPanel(parent); create_selection_panel(m_selection_panel);