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

Implement exception rethrow for ui jobs

Browse source
This commit is contained in:
tamasmeszaros 2021-01-19 15:00:44 +01:00
parent 264ce71e94
commit 56e7d83513
11 changed files with 112 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/slic3r/GUI/Jobs/Job.cpp
View file

@ -1,4 +1,5 @@
#include <algorithm>
#include <exception>
#include "Job.hpp"
#include <libslic3r/Thread.hpp>
@ -6,10 +7,15 @@
namespace Slic3r {
void GUI::Job::run()
void GUI::Job::run(std::exception_ptr &eptr)
{
m_running.store(true);
process();
try {
process();
} catch (...) {
eptr = std::current_exception();
}
m_running.store(false);
// ensure to call the last status to finalize the job
@ -27,22 +33,29 @@ void GUI::Job::update_status(int st, const wxString &msg)
GUI::Job::Job(std::shared_ptr<ProgressIndicator> pri)
: m_progress(std::move(pri))
{
Bind(wxEVT_THREAD, [this](const wxThreadEvent &evt) {
Bind(wxEVT_THREAD, [this](const wxThreadEvent &evt) {
auto msg = evt.GetString();
if (!msg.empty())
if (!msg.empty() && !m_worker_error)
m_progress->set_status_text(msg.ToUTF8().data());
if (m_finalized) return;
m_progress->set_progress(evt.GetInt());
if (evt.GetInt() == status_range()) {
if (evt.GetInt() == status_range() || m_worker_error) {
// set back the original range and cancel callback
m_progress->set_range(m_range);
m_progress->set_cancel_callback();
wxEndBusyCursor();
finalize();
if (m_worker_error) {
m_finalized = true;
m_progress->set_status_text("");
m_progress->set_progress(m_range);
on_exception(m_worker_error);
}
else
finalize();
// dont do finalization again for the same process
m_finalized = true;
}
@ -69,7 +82,8 @@ void GUI::Job::start()
wxBeginBusyCursor();
try { // Execute the job
m_thread = create_thread([this] { this->run(); });
m_worker_error = nullptr;
m_thread = create_thread([this] { this->run(m_worker_error); });
} catch (std::exception &) {
update_status(status_range(),
_(L("ERROR: not enough resources to "