This commit is contained in:
bubnikv 2018-12-18 19:13:15 +01:00
commit b2e40d5046
6 changed files with 62 additions and 15 deletions

View file

@ -11,6 +11,7 @@
namespace Slic3r { namespace Slic3r {
extern void set_logging_level(unsigned int level); extern void set_logging_level(unsigned int level);
extern unsigned get_logging_level();
extern void trace(unsigned int level, const char *message); extern void trace(unsigned int level, const char *message);
// Format memory allocated, separate thousands by comma. // Format memory allocated, separate thousands by comma.
extern std::string format_memsize_MB(size_t n); extern std::string format_memsize_MB(size_t n);

View file

@ -59,6 +59,18 @@ void set_logging_level(unsigned int level)
); );
} }
unsigned get_logging_level()
{
switch (logSeverity) {
case boost::log::trivial::fatal : return 0;
case boost::log::trivial::error : return 1;
case boost::log::trivial::warning : return 2;
case boost::log::trivial::info : return 3;
case boost::log::trivial::debug : return 4;
default: return 1;
}
}
// Force set_logging_level(<=error) after loading of the DLL. // Force set_logging_level(<=error) after loading of the DLL.
// Switch boost::filesystem to utf8. // Switch boost::filesystem to utf8.
static struct RunOnInit { static struct RunOnInit {

View file

@ -6,6 +6,7 @@
#include <wx/button.h> #include <wx/button.h>
#include <wx/statbmp.h> #include <wx/statbmp.h>
#include <wx/scrolwin.h> #include <wx/scrolwin.h>
#include <wx/clipbrd.h>
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
@ -61,8 +62,11 @@ MsgDialog::~MsgDialog() {}
// ErrorDialog // ErrorDialog
ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg) : ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg)
MsgDialog(parent, _(L("Slic3r error")), _(L("Slic3r has encountered an error")), wxBitmap(from_u8(Slic3r::var("Slic3r_192px_grayscale.png")), wxBITMAP_TYPE_PNG)) : MsgDialog(parent, _(L("Slic3r error")), _(L("Slic3r has encountered an error")),
wxBitmap(from_u8(Slic3r::var("Slic3r_192px_grayscale.png")), wxBITMAP_TYPE_PNG),
wxID_NONE)
, msg(msg)
{ {
auto *panel = new wxScrolledWindow(this); auto *panel = new wxScrolledWindow(this);
auto *p_sizer = new wxBoxSizer(wxVERTICAL); auto *p_sizer = new wxBoxSizer(wxVERTICAL);
@ -77,6 +81,20 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg) :
content_sizer->Add(panel, 1, wxEXPAND); content_sizer->Add(panel, 1, wxEXPAND);
auto *btn_copy = new wxButton(this, wxID_ANY, _(L("Copy to clipboard")));
btn_copy->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) {
if (wxTheClipboard->Open()) {
wxTheClipboard->SetData(new wxTextDataObject(this->msg)); // Note: the clipboard takes ownership of the pointer
wxTheClipboard->Close();
}
});
auto *btn_ok = new wxButton(this, wxID_OK);
btn_ok->SetFocus();
btn_sizer->Add(btn_copy, 0, wxRIGHT, HORIZ_SPACING);
btn_sizer->Add(btn_ok);
SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT)); SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT));
Fit(); Fit();
} }

View file

@ -50,14 +50,18 @@ protected:
// Generic error dialog, used for displaying exceptions // Generic error dialog, used for displaying exceptions
struct ErrorDialog : MsgDialog class ErrorDialog : public MsgDialog
{ {
public:
ErrorDialog(wxWindow *parent, const wxString &msg); ErrorDialog(wxWindow *parent, const wxString &msg);
ErrorDialog(ErrorDialog &&) = delete; ErrorDialog(ErrorDialog &&) = delete;
ErrorDialog(const ErrorDialog &) = delete; ErrorDialog(const ErrorDialog &) = delete;
ErrorDialog &operator=(ErrorDialog &&) = delete; ErrorDialog &operator=(ErrorDialog &&) = delete;
ErrorDialog &operator=(const ErrorDialog &) = delete; ErrorDialog &operator=(const ErrorDialog &) = delete;
virtual ~ErrorDialog(); virtual ~ErrorDialog();
private:
wxString msg;
}; };

View file

@ -11,6 +11,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "libslic3r/Utils.hpp"
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
@ -44,6 +45,7 @@ struct Http::priv
// Using a deque here because unlike vector it doesn't ivalidate pointers on insertion // Using a deque here because unlike vector it doesn't ivalidate pointers on insertion
std::deque<fs::ifstream> form_files; std::deque<fs::ifstream> form_files;
std::string postfields; std::string postfields;
std::string error_buffer; // Used for CURLOPT_ERRORBUFFER
size_t limit; size_t limit;
bool cancel; bool cancel;
@ -69,13 +71,14 @@ struct Http::priv
void http_perform(); void http_perform();
}; };
Http::priv::priv(const std::string &url) : Http::priv::priv(const std::string &url)
curl(::curl_easy_init()), : curl(::curl_easy_init())
form(nullptr), , form(nullptr)
form_end(nullptr), , form_end(nullptr)
headerlist(nullptr), , headerlist(nullptr)
limit(0), , error_buffer(CURL_ERROR_SIZE + 1, '\0')
cancel(false) , limit(0)
, cancel(false)
{ {
if (curl == nullptr) { if (curl == nullptr) {
throw std::runtime_error(std::string("Could not construct Curl object")); throw std::runtime_error(std::string("Could not construct Curl object"));
@ -83,6 +86,7 @@ Http::priv::priv(const std::string &url) :
::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); // curl makes a copy internally ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); // curl makes a copy internally
::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_FORK_NAME "/" SLIC3R_VERSION); ::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_FORK_NAME "/" SLIC3R_VERSION);
::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer.front());
} }
Http::priv::~priv() Http::priv::~priv()
@ -199,9 +203,10 @@ void Http::priv::set_post_body(const fs::path &path)
std::string Http::priv::curl_error(CURLcode curlcode) std::string Http::priv::curl_error(CURLcode curlcode)
{ {
return (boost::format("%1% (%2%)") return (boost::format("%1% (%2%): %3%")
% ::curl_easy_strerror(curlcode) % ::curl_easy_strerror(curlcode)
% curlcode % curlcode
% error_buffer
).str(); ).str();
} }
@ -227,9 +232,7 @@ void Http::priv::http_perform()
::curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, static_cast<void*>(this)); ::curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, static_cast<void*>(this));
#endif #endif
#ifndef NDEBUG ::curl_easy_setopt(curl, CURLOPT_VERBOSE, get_logging_level() >= 4);
::curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
#endif
if (headerlist != nullptr) { if (headerlist != nullptr) {
::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist); ::curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);

View file

@ -3,6 +3,7 @@
#include <vector> #include <vector>
#include <thread> #include <thread>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/log/trivial.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <wx/app.h> #include <wx/app.h>
@ -144,6 +145,10 @@ void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job)
{ {
if (bg_exit || the_job.empty()) { return; } if (bg_exit || the_job.empty()) { return; }
BOOST_LOG_TRIVIAL(debug) << boost::format("PrintHostJobQueue/bg_thread: Got job: `%1%` -> `%1%`")
% the_job.upload_data.upload_path
% the_job.printhost->get_host();
const fs::path gcode_path = the_job.upload_data.source_path; const fs::path gcode_path = the_job.upload_data.source_path;
the_job.printhost->upload(std::move(the_job.upload_data), the_job.printhost->upload(std::move(the_job.upload_data),
@ -154,7 +159,11 @@ void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job)
auto evt = new PrintHostQueueDialog::Event(GUI::EVT_PRINTHOST_PROGRESS, queue_dialog->GetId(), job_id, 100); auto evt = new PrintHostQueueDialog::Event(GUI::EVT_PRINTHOST_PROGRESS, queue_dialog->GetId(), job_id, 100);
wxQueueEvent(queue_dialog, evt); wxQueueEvent(queue_dialog, evt);
fs::remove(gcode_path); // XXX: error handling boost::system::error_code ec;
fs::remove(gcode_path, ec);
if (ec) {
BOOST_LOG_TRIVIAL(error) << boost::format("PrintHostJobQueue: Error removing file `%1%`: %2%") % gcode_path % ec;
}
} }
void PrintHostJobQueue::enqueue(PrintHostJob job) void PrintHostJobQueue::enqueue(PrintHostJob job)