3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 17:21:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FirmwareDialog: Fix progress display

Browse source
This commit is contained in:
Vojtech Kral 2018-06-05 11:55:23 +02:00 • committed by bubnikv
parent 2a07f3a0d5
commit 5414f7379d
4 changed files with 43 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
xs/src/avrdude/avrdude-slic3r.cpp
View file

@ -34,6 +34,7 @@ struct AvrDude::priv
{
std::string sys_config;
std::vector<std::string> args;
RunFn run_fn;
MessageFn message_fn;
ProgressFn progress_fn;
CompleteFn complete_fn;
@ -94,6 +95,12 @@ AvrDude& AvrDude::args(std::vector<std::string> args)
return *this;
}
AvrDude& AvrDude::on_run(RunFn fn)
{
if (p) { p->run_fn = std::move(fn); }
return *this;
}
AvrDude& AvrDude::on_message(MessageFn fn)
{
if (p) { p->message_fn = std::move(fn); }
@ -123,11 +130,17 @@ AvrDude::Ptr AvrDude::run()
if (self->p) {
auto avrdude_thread = std::thread([self]() {
auto res = self->p->run();
if (self->p->complete_fn) {
self->p->complete_fn(res);
}
});
if (self->p->run_fn) {
self->p->run_fn();
}
auto res = self->p->run();
if (self->p->complete_fn) {
self->p->complete_fn(res);
}
});
self->p->avrdude_thread = std::move(avrdude_thread);
}