From 988e4d9f84345ad69cc31bc564a5efb301e184b5 Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Tue, 4 Jul 2023 12:08:05 +0800 Subject: [PATCH] FIX: sending progress bar Change-Id: I165632ddaab1cb90ab4dd41310147d79f69562e8 (cherry picked from commit 28b8db496bb0d651f45508b44c64bfa2a0c30114) --- src/slic3r/GUI/CalibrationWizardPresetPage.cpp | 1 + src/slic3r/GUI/Plater.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index f1956d028..85ad9b3a1 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1144,6 +1144,7 @@ void CalibrationPresetPage::show_status(CaliPresetPageStatus status) Enable_Send_Button(false); } else if (status == CaliPresetPageStatus::CaliPresetStatusNormal) { + m_sending_panel->Show(false); update_print_status_msg(wxEmptyString, false); Enable_Send_Button(true); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 6105c82ba..adbf0f8f9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2600,7 +2600,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) q->Bind(EVT_DOWNLOAD_PROJECT, &priv::on_action_download_project, this); q->Bind(EVT_IMPORT_MODEL_ID, &priv::on_action_request_model_id, this); q->Bind(EVT_PRINT_FINISHED, [q](wxCommandEvent &evt) { q->print_job_finished(evt); }); - q->Bind(EVT_SEND_CALIBRATION_FINISHED, [q](wxCommandEvent &evt) { q->send_calibration_job_finished(evt); }); + q->Bind(EVT_SEND_CALIBRATION_FINISHED, [q](wxCommandEvent& evt) { q->send_calibration_job_finished(evt); }); q->Bind(EVT_SEND_FINISHED, [q](wxCommandEvent &evt) { q->send_job_finished(evt); }); q->Bind(EVT_PUBLISH_FINISHED, [q](wxCommandEvent &evt) { q->publish_job_finished(evt);}); //q->Bind(EVT_GLVIEWTOOLBAR_ASSEMBLE, [q](SimpleEvent&) { q->select_view_3D("Assemble"); }); @@ -10845,6 +10845,7 @@ void Plater::send_calibration_job_finished(wxCommandEvent & evt) if (calibration_panel) { auto curr_wizard = static_cast(calibration_panel->get_tabpanel()->GetPage(evt.GetInt())); wxCommandEvent event(EVT_CALIBRATION_JOB_FINISHED); + event.SetString(evt.GetString()); event.SetEventObject(curr_wizard); wxPostEvent(curr_wizard, event); }