3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 18:27:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Printhost upload progress bar notification

Browse source
This commit is contained in:
David Kocik 2021-03-04 21:56:07 +01:00
parent bf032524eb
commit 6716492efa
5 changed files with 143 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/slic3r/GUI/PrintHostDialogs.cpp
View file

@ -25,6 +25,7 @@
#include "wxExtensions.hpp"
#include "MainFrame.hpp"
#include "libslic3r/AppConfig.hpp"
#include "NotificationManager.hpp"
namespace fs = boost::filesystem;
@ -280,6 +281,9 @@ void PrintHostQueueDialog::append_job(const PrintHostJob &job)
job_list->AppendItem(fields, static_cast<wxUIntPtr>(ST_NEW));
// Both strings are UTF-8 encoded.
upload_names.emplace_back(job.printhost->get_host(), job.upload_data.upload_path.string());
std::string notification_text = "[" + std::to_string(job_list->GetItemCount()) + "] " + job.upload_data.upload_path.string() + " -> " + job.printhost->get_host();
wxGetApp().notification_manager()->push_progress_bar_notification(notification_text);
}
void PrintHostQueueDialog::on_dpi_changed(const wxRect &suggested_rect)
@ -345,6 +349,15 @@ void PrintHostQueueDialog::on_progress(Event &evt)
}
on_list_select();
if (evt.progress > 0)
{
wxVariant nm, hst;
job_list->GetValue(nm, evt.job_id, COL_FILENAME);
job_list->GetValue(hst, evt.job_id, COL_HOST);
std::string notification_text = "[" + std::to_string(evt.job_id + 1) + "] " + boost::nowide::narrow(nm.GetString()) + " -> " + boost::nowide::narrow(hst.GetString());
wxGetApp().notification_manager()->set_progress_bar_percentage(notification_text, 100 / evt.progress);
}
}
void PrintHostQueueDialog::on_error(Event &evt)
@ -360,6 +373,12 @@ void PrintHostQueueDialog::on_error(Event &evt)
on_list_select();
GUI::show_error(nullptr, errormsg);
wxVariant nm, hst;
job_list->GetValue(nm, evt.job_id, COL_FILENAME);
job_list->GetValue(hst, evt.job_id, COL_HOST);
std::string notification_text = "[" + std::to_string(evt.job_id + 1) + "] " + boost::nowide::narrow(nm.GetString()) + " -> " + boost::nowide::narrow(hst.GetString());
wxGetApp().notification_manager()->progress_bar_show_error(notification_text);
}
void PrintHostQueueDialog::on_cancel(Event &evt)
@ -370,6 +389,12 @@ void PrintHostQueueDialog::on_cancel(Event &evt)
job_list->SetValue(wxVariant(0), evt.job_id, COL_PROGRESS);
on_list_select();
wxVariant nm, hst;
job_list->GetValue(nm, evt.job_id, COL_FILENAME);
job_list->GetValue(hst, evt.job_id, COL_HOST);
std::string notification_text = "[" + std::to_string(evt.job_id + 1) + "] " + boost::nowide::narrow(nm.GetString()) + " -> " + boost::nowide::narrow(hst.GetString());
wxGetApp().notification_manager()->progress_bar_show_canceled(notification_text);
}
void PrintHostQueueDialog::get_active_jobs(std::vector<std::pair<std::string, std::string>>& ret)