FIX: sending progress bar
Change-Id: I165632ddaab1cb90ab4dd41310147d79f69562e8 (cherry picked from commit 28b8db496bb0d651f45508b44c64bfa2a0c30114)
This commit is contained in:
parent
361b26faf6
commit
988e4d9f84
2 changed files with 3 additions and 1 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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<CalibrationWizard*>(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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue