juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-21 09:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: refix flowrate fine cali lacks a sending progressbar

Browse Source 
JIRA: STUDIO-4013

Change-Id: Ie4989c9bd5a587de480b07ea9977523151d2489c
This commit is contained in:
liz.li
2023-10-12 17:14:28 +08:00
committed by Lane.Wei
parent e7ffce7f53
commit e697fee9ae
8 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@@ -1272,14 +1272,6 @@ void CalibrationFlowCoarseSavePage::create_page(wxWindow* parent)
m_sending_panel = new CaliPageSendingPanel(parent);
m_sending_panel->get_sending_progress_bar()->set_cancel_callback_fina([this]() {
BOOST_LOG_TRIVIAL(info) << "CalibrationWizard::print_job: enter canceled";
if (CalibUtils::print_job) {
if (CalibUtils::print_job->is_running()) {
BOOST_LOG_TRIVIAL(info) << "calibration_print_job: canceled";
CalibUtils::print_job->cancel();
}
CalibUtils::print_job->join();
}
on_cali_cancel_job();
});
m_sending_panel->Hide();
@@ -1367,10 +1359,21 @@ void CalibrationFlowCoarseSavePage::on_cali_finished_job()
m_sending_panel->Show(false);
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_FLOW_CALI_STAGE_2, true);
m_action_panel->show_button(CaliPageActionType::CALI_ACTION_FLOW_CALI_STAGE_2, true);
Layout();
Fit();
}
void CalibrationFlowCoarseSavePage::on_cali_cancel_job()
{
BOOST_LOG_TRIVIAL(info) << "CalibrationWizard::print_job: enter canceled";
if (CalibUtils::print_job) {
if (CalibUtils::print_job->is_running()) {
BOOST_LOG_TRIVIAL(info) << "calibration_print_job: canceled";
CalibUtils::print_job->cancel();
}
CalibUtils::print_job->join();
}
m_sending_panel->reset();
m_sending_panel->Show(false);
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_FLOW_CALI_STAGE_2, true);