3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PrintHost: Basic SL1 support

Browse Source
This commit is contained in:
Vojtech Kral 2018-12-18 14:34:16 +01:00
parent 59b01b4908
commit 66b5deccf5
8 changed files with 255 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/PrintConfig.hpp
View File

@ -36,7 +36,7 @@ enum GCodeFlavor {
}; };
enum PrintHostType { enum PrintHostType {
htOctoPrint, htDuet, htOctoPrint, htDuet, htSL1,
}; };
enum InfillPattern { enum InfillPattern {

2
src/slic3r/GUI/Plater.cpp
View File

@ -3244,6 +3244,8 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
#endif // ENABLE_REMOVE_TABS_FROM_PLATER #endif // ENABLE_REMOVE_TABS_FROM_PLATER
if (p->preview) p->preview->set_bed_shape(p->config->option<ConfigOptionPoints>("bed_shape")->values); if (p->preview) p->preview->set_bed_shape(p->config->option<ConfigOptionPoints>("bed_shape")->values);
update_scheduled = true; update_scheduled = true;
} else if (opt_key == "host_type" && this->p->printer_technology == ptSLA) {
p->config->option<ConfigOptionEnum<PrintHostType>>(opt_key)->value = htSL1;
} }
} }

1
src/slic3r/GUI/Preset.cpp
View File

@ -456,6 +456,7 @@ const std::vector<std::string>& Preset::sla_printer_options()
"display_width", "display_height", "display_pixels_x", "display_pixels_y", "display_width", "display_height", "display_pixels_x", "display_pixels_y",
"display_orientation", "display_orientation",
"printer_correction", "printer_correction",
"print_host", "printhost_apikey", "printhost_cafile",
"printer_notes", "printer_notes",
"inherits" "inherits"
}; };

197
src/slic3r/GUI/Tab.cpp
View File

@ -1538,6 +1538,108 @@ bool Tab::current_preset_is_dirty()
return m_presets->current_is_dirty(); return m_presets->current_is_dirty();
} }
void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup)
{
const bool sla = m_presets->get_selected_preset().printer_technology() == ptSLA;
// Only offer the host type selection for FFF, for SLA it's always the SL1 printer (at the moment)
if (! sla) {
optgroup->append_single_option_line("host_type");
} else {
m_config->option<ConfigOptionEnum<PrintHostType>>("host_type", true)->value = htSL1;
}
auto printhost_browse = [this, optgroup] (wxWindow* parent) {
// TODO: SLA
auto btn = m_printhost_browse_btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("zoom.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this, parent, optgroup](wxCommandEvent e) {
BonjourDialog dialog(parent);
if (dialog.show_and_lookup()) {
optgroup->set_value("print_host", std::move(dialog.get_selected()), true);
}
});
return sizer;
};
auto print_host_test = [this](wxWindow* parent) {
auto btn = m_print_host_test_btn = new wxButton(parent, wxID_ANY, _(L("Test")),
wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("wrench.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
std::unique_ptr<PrintHost> host(PrintHost::get_print_host(m_config));
if (! host) {
const auto text = wxString::Format("%s",
_(L("Could not get a valid Printer Host reference")));
show_error(this, text);
return;
}
wxString msg;
if (host->test(msg)) {
show_info(this, host->get_test_ok_msg(), _(L("Success!")));
} else {
show_error(this, host->get_test_failed_msg(msg));
}
});
return sizer;
};
Line host_line = optgroup->create_single_option_line("print_host");
host_line.append_widget(printhost_browse);
host_line.append_widget(print_host_test);
optgroup->append_line(host_line);
optgroup->append_single_option_line("printhost_apikey");
if (Http::ca_file_supported()) {
Line cafile_line = optgroup->create_single_option_line("printhost_cafile");
auto printhost_cafile_browse = [this, optgroup] (wxWindow* parent) {
auto btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("zoom.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this, optgroup] (wxCommandEvent e) {
static const auto filemasks = _(L("Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"));
wxFileDialog openFileDialog(this, _(L("Open CA certificate file")), "", "", filemasks, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (openFileDialog.ShowModal() != wxID_CANCEL) {
optgroup->set_value("printhost_cafile", std::move(openFileDialog.GetPath()), true);
}
});
return sizer;
};
cafile_line.append_widget(printhost_cafile_browse);
optgroup->append_line(cafile_line);
auto printhost_cafile_hint = [this, optgroup] (wxWindow* parent) {
auto txt = new wxStaticText(parent, wxID_ANY,
_(L("HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate.")));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(txt);
return sizer;
};
Line cafile_hint { "", "" };
cafile_hint.full_width = 1;
cafile_hint.widget = std::move(printhost_cafile_hint);
optgroup->append_line(cafile_hint);
}
}
void TabPrinter::build() void TabPrinter::build()
{ {
m_presets = &m_preset_bundle->printers; m_presets = &m_preset_bundle->printers;
@ -1665,96 +1767,8 @@ void TabPrinter::build_fff()
} }
#endif #endif
optgroup = page->new_optgroup(_(L("Printer Host upload"))); optgroup = page->new_optgroup(_(L("Print Host upload")));
build_printhost(optgroup.get());
optgroup->append_single_option_line("host_type");
auto printhost_browse = [this, optgroup] (wxWindow* parent) {
auto btn = m_printhost_browse_btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("zoom.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this, parent, optgroup](wxCommandEvent e) {
BonjourDialog dialog(parent);
if (dialog.show_and_lookup()) {
optgroup->set_value("print_host", std::move(dialog.get_selected()), true);
}
});
return sizer;
};
auto print_host_test = [this](wxWindow* parent) {
auto btn = m_print_host_test_btn = new wxButton(parent, wxID_ANY, _(L("Test")),
wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("wrench.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent e) {
std::unique_ptr<PrintHost> host(PrintHost::get_print_host(m_config));
if (! host) {
const auto text = wxString::Format("%s",
_(L("Could not get a valid Printer Host reference")));
show_error(this, text);
return;
}
wxString msg;
if (host->test(msg)) {
show_info(this, host->get_test_ok_msg(), _(L("Success!")));
} else {
show_error(this, host->get_test_failed_msg(msg));
}
});
return sizer;
};
Line host_line = optgroup->create_single_option_line("print_host");
host_line.append_widget(printhost_browse);
host_line.append_widget(print_host_test);
optgroup->append_line(host_line);
optgroup->append_single_option_line("printhost_apikey");
if (Http::ca_file_supported()) {
Line cafile_line = optgroup->create_single_option_line("printhost_cafile");
auto printhost_cafile_browse = [this, optgroup] (wxWindow* parent) {
auto btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("zoom.png")), wxBITMAP_TYPE_PNG));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(btn);
btn->Bind(wxEVT_BUTTON, [this, optgroup] (wxCommandEvent e) {
static const auto filemasks = _(L("Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"));
wxFileDialog openFileDialog(this, _(L("Open CA certificate file")), "", "", filemasks, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (openFileDialog.ShowModal() != wxID_CANCEL) {
optgroup->set_value("printhost_cafile", std::move(openFileDialog.GetPath()), true);
}
});
return sizer;
};
cafile_line.append_widget(printhost_cafile_browse);
optgroup->append_line(cafile_line);
auto printhost_cafile_hint = [this, optgroup] (wxWindow* parent) {
auto txt = new wxStaticText(parent, wxID_ANY,
_(L("HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate.")));
auto sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(txt);
return sizer;
};
Line cafile_hint { "", "" };
cafile_hint.full_width = 1;
cafile_hint.widget = std::move(printhost_cafile_hint);
optgroup->append_line(cafile_hint);
}
optgroup = page->new_optgroup(_(L("Firmware"))); optgroup = page->new_optgroup(_(L("Firmware")));
optgroup->append_single_option_line("gcode_flavor"); optgroup->append_single_option_line("gcode_flavor");
@ -1897,6 +1911,9 @@ void TabPrinter::build_sla()
} }
optgroup->append_line(line); optgroup->append_line(line);
optgroup = page->new_optgroup(_(L("Print Host upload")));
build_printhost(optgroup.get());
page = add_options_page(_(L("Notes")), "note.png"); page = add_options_page(_(L("Notes")), "note.png");
optgroup = page->new_optgroup(_(L("Notes")), 0); optgroup = page->new_optgroup(_(L("Notes")), 0);
option = optgroup->get_option("printer_notes"); option = optgroup->get_option("printer_notes");

2
src/slic3r/GUI/Tab.hpp
View File

@ -325,6 +325,8 @@ class TabPrinter : public Tab
std::vector<PageShp> m_pages_fff; std::vector<PageShp> m_pages_fff;
std::vector<PageShp> m_pages_sla; std::vector<PageShp> m_pages_sla;
void build_printhost(ConfigOptionsGroup *optgroup);
public: public:
wxButton* m_serial_test_btn = nullptr; wxButton* m_serial_test_btn = nullptr;
wxButton* m_print_host_test_btn = nullptr; wxButton* m_print_host_test_btn = nullptr;

188
src/slic3r/Utils/OctoPrint.cpp
View File

@ -17,141 +17,161 @@ namespace fs = boost::filesystem;
namespace Slic3r { namespace Slic3r {
OctoPrint::OctoPrint(DynamicPrintConfig *config) : OctoPrint::OctoPrint(DynamicPrintConfig *config) :
host(config->opt_string("print_host")), host(config->opt_string("print_host")),
apikey(config->opt_string("printhost_apikey")), apikey(config->opt_string("printhost_apikey")),
cafile(config->opt_string("printhost_cafile")) cafile(config->opt_string("printhost_cafile"))
{} {}
OctoPrint::~OctoPrint() {} OctoPrint::~OctoPrint() {}
bool OctoPrint::test(wxString &msg) const bool OctoPrint::test(wxString &msg) const
{ {
// Since the request is performed synchronously here, // Since the request is performed synchronously here,
// it is ok to refer to `msg` from within the closure // it is ok to refer to `msg` from within the closure
bool res = true; bool res = true;
auto url = make_url("api/version"); auto url = make_url("api/version");
BOOST_LOG_TRIVIAL(info) << boost::format("Octoprint: Get version at: %1%") % url; BOOST_LOG_TRIVIAL(info) << boost::format("Octoprint: Get version at: %1%") % url;
auto http = Http::get(std::move(url)); auto http = Http::get(std::move(url));
set_auth(http); set_auth(http);
http.on_error([&](std::string body, std::string error, unsigned status) { http.on_error([&](std::string body, std::string error, unsigned status) {
BOOST_LOG_TRIVIAL(error) << boost::format("Octoprint: Error getting version: %1%, HTTP %2%, body: `%3%`") % error % status % body; BOOST_LOG_TRIVIAL(error) << boost::format("Octoprint: Error getting version: %1%, HTTP %2%, body: `%3%`") % error % status % body;
res = false; res = false;
msg = format_error(body, error, status); msg = format_error(body, error, status);
}) })
.on_complete([&](std::string body, unsigned) { .on_complete([&](std::string body, unsigned) {
BOOST_LOG_TRIVIAL(debug) << boost::format("Octoprint: Got version: %1%") % body; BOOST_LOG_TRIVIAL(debug) << boost::format("Octoprint: Got version: %1%") % body;
})
.perform_sync();
return res; // TODO: parse body, call validate_version_text
})
.perform_sync();
return res;
} }
wxString OctoPrint::get_test_ok_msg () const wxString OctoPrint::get_test_ok_msg () const
{ {
return wxString::Format("%s", _(L("Connection to OctoPrint works correctly."))); return wxString::Format("%s", _(L("Connection to OctoPrint works correctly.")));
} }
wxString OctoPrint::get_test_failed_msg (wxString &msg) const wxString OctoPrint::get_test_failed_msg (wxString &msg) const
{ {
return wxString::Format("%s: %s\n\n%s", return wxString::Format("%s: %s\n\n%s",
_(L("Could not connect to OctoPrint")), msg, _(L("Note: OctoPrint version at least 1.1.0 is required."))); _(L("Could not connect to OctoPrint")), msg, _(L("Note: OctoPrint version at least 1.1.0 is required.")));
} }
bool OctoPrint::upload(PrintHostUpload upload_data, Http::ProgressFn prorgess_fn, Http::ErrorFn error_fn) const bool OctoPrint::upload(PrintHostUpload upload_data, Http::ProgressFn prorgess_fn, Http::ErrorFn error_fn) const
{ {
const auto upload_filename = upload_data.upload_path.filename(); const auto upload_filename = upload_data.upload_path.filename();
const auto upload_parent_path = upload_data.upload_path.parent_path(); const auto upload_parent_path = upload_data.upload_path.parent_path();
wxString test_msg; wxString test_msg;
if (! test(test_msg)) { if (! test(test_msg)) {
// TODO: // TODO:
// auto errormsg = wxString::Format("%s: %s", errortitle, test_msg); // auto errormsg = wxString::Format("%s: %s", errortitle, test_msg);
// GUI::show_error(&progress_dialog, std::move(errormsg)); // GUI::show_error(&progress_dialog, std::move(errormsg));
// return false; // return false;
} }
bool res = true; bool res = true;
auto url = make_url("api/files/local"); auto url = make_url("api/files/local");
BOOST_LOG_TRIVIAL(info) << boost::format("Octoprint: Uploading file %1% at %2%, filename: %3%, path: %4%, print: %5%") BOOST_LOG_TRIVIAL(info) << boost::format("Octoprint: Uploading file %1% at %2%, filename: %3%, path: %4%, print: %5%")
% upload_data.source_path.string() % upload_data.source_path.string()
% url % url
% upload_filename.string() % upload_filename.string()
% upload_parent_path.string() % upload_parent_path.string()
% upload_data.start_print; % upload_data.start_print;
auto http = Http::post(std::move(url)); auto http = Http::post(std::move(url));
set_auth(http); set_auth(http);
http.form_add("print", upload_data.start_print ? "true" : "false") http.form_add("print", upload_data.start_print ? "true" : "false")
.form_add("path", upload_parent_path.string()) // XXX: slashes on windows ??? .form_add("path", upload_parent_path.string()) // XXX: slashes on windows ???
.form_add_file("file", upload_data.source_path.string(), upload_filename.string()) .form_add_file("file", upload_data.source_path.string(), upload_filename.string())
.on_complete([&](std::string body, unsigned status) { .on_complete([&](std::string body, unsigned status) {
BOOST_LOG_TRIVIAL(debug) << boost::format("Octoprint: File uploaded: HTTP %1%: %2%") % status % body; BOOST_LOG_TRIVIAL(debug) << boost::format("Octoprint: File uploaded: HTTP %1%: %2%") % status % body;
}) })
.on_error([&](std::string body, std::string error, unsigned status) { .on_error([&](std::string body, std::string error, unsigned status) {
BOOST_LOG_TRIVIAL(error) << boost::format("Octoprint: Error uploading file: %1%, HTTP %2%, body: `%3%`") % error % status % body; BOOST_LOG_TRIVIAL(error) << boost::format("Octoprint: Error uploading file: %1%, HTTP %2%, body: `%3%`") % error % status % body;
error_fn(std::move(body), std::move(error), status); error_fn(std::move(body), std::move(error), status);
res = false; res = false;
}) })
.on_progress([&](Http::Progress progress, bool &cancel) { .on_progress([&](Http::Progress progress, bool &cancel) {
prorgess_fn(std::move(progress), cancel); prorgess_fn(std::move(progress), cancel);
if (cancel) { if (cancel) {
// Upload was canceled // Upload was canceled
BOOST_LOG_TRIVIAL(error) << "Octoprint: Upload canceled"; BOOST_LOG_TRIVIAL(error) << "Octoprint: Upload canceled";
res = false; res = false;
} }
}) })
.perform_sync(); .perform_sync();
return res; return res;
} }
bool OctoPrint::has_auto_discovery() const bool OctoPrint::has_auto_discovery() const
{ {
return true; return true;
} }
bool OctoPrint::can_test() const bool OctoPrint::can_test() const
{ {
return true; return true;
}
bool OctoPrint::validate_version_text(const std::string &version_text)
{
// FIXME
return true;
} }
void OctoPrint::set_auth(Http &http) const void OctoPrint::set_auth(Http &http) const
{ {
http.header("X-Api-Key", apikey); http.header("X-Api-Key", apikey);
if (! cafile.empty()) { if (! cafile.empty()) {
http.ca_file(cafile); http.ca_file(cafile);
} }
} }
std::string OctoPrint::make_url(const std::string &path) const std::string OctoPrint::make_url(const std::string &path) const
{ {
if (host.find("http://") == 0 || host.find("https://") == 0) { if (host.find("http://") == 0 || host.find("https://") == 0) {
if (host.back() == '/') { if (host.back() == '/') {
return (boost::format("%1%%2%") % host % path).str(); return (boost::format("%1%%2%") % host % path).str();
} else { } else {
return (boost::format("%1%/%2%") % host % path).str(); return (boost::format("%1%/%2%") % host % path).str();
} }
} else { } else {
return (boost::format("http://%1%/%2%") % host % path).str(); return (boost::format("http://%1%/%2%") % host % path).str();
} }
} }
wxString OctoPrint::format_error(const std::string &body, const std::string &error, unsigned status) wxString OctoPrint::format_error(const std::string &body, const std::string &error, unsigned status)
{ {
if (status != 0) { if (status != 0) {
auto wxbody = wxString::FromUTF8(body.data()); auto wxbody = wxString::FromUTF8(body.data());
return wxString::Format("HTTP %u: %s", status, wxbody); return wxString::Format("HTTP %u: %s", status, wxbody);
} else { } else {
return wxString::FromUTF8(error.data()); return wxString::FromUTF8(error.data());
} }
}
// SL1
SL1Host::~SL1Host() {}
bool SL1Host::validate_version_text(const std::string &version_text)
{
// FIXME
return true;
} }

45
src/slic3r/Utils/OctoPrint.hpp
View File

@ -16,24 +16,39 @@ class Http;
class OctoPrint : public PrintHost class OctoPrint : public PrintHost
{ {
public: public:
OctoPrint(DynamicPrintConfig *config); OctoPrint(DynamicPrintConfig *config);
virtual ~OctoPrint(); virtual ~OctoPrint();
bool test(wxString &curl_msg) const;
wxString get_test_ok_msg () const;
wxString get_test_failed_msg (wxString &msg) const;
bool upload(PrintHostUpload upload_data, Http::ProgressFn prorgess_fn, Http::ErrorFn error_fn) const;
bool has_auto_discovery() const;
bool can_test() const;
virtual std::string get_host() const { return host; }
protected:
virtual bool validate_version_text(const std::string &version_text);
bool test(wxString &curl_msg) const;
wxString get_test_ok_msg () const;
wxString get_test_failed_msg (wxString &msg) const;
bool upload(PrintHostUpload upload_data, Http::ProgressFn prorgess_fn, Http::ErrorFn error_fn) const;
bool has_auto_discovery() const;
bool can_test() const;
virtual std::string get_host() const { return host; }
private: private:
std::string host; std::string host;
std::string apikey; std::string apikey;
std::string cafile; std::string cafile;
void set_auth(Http &http) const; void set_auth(Http &http) const;
std::string make_url(const std::string &path) const; std::string make_url(const std::string &path) const;
static wxString format_error(const std::string &body, const std::string &error, unsigned status); static wxString format_error(const std::string &body, const std::string &error, unsigned status);
};
class SL1Host: public OctoPrint
{
public:
SL1Host(DynamicPrintConfig *config) : OctoPrint(config) {}
virtual ~SL1Host();
protected:
virtual bool validate_version_text(const std::string &version_text);
}; };

14
src/slic3r/Utils/PrintHost.cpp
View File

@ -24,13 +24,15 @@ PrintHost::~PrintHost() {}
PrintHost* PrintHost::get_print_host(DynamicPrintConfig *config) PrintHost* PrintHost::get_print_host(DynamicPrintConfig *config)
{ {
PrintHostType kind = config->option<ConfigOptionEnum<PrintHostType>>("host_type")->value; const auto opt = config->option<ConfigOptionEnum<PrintHostType>>("host_type");
if (kind == htOctoPrint) { if (opt == nullptr) { return nullptr; }
return new OctoPrint(config);
} else if (kind == htDuet) { switch (opt->value) {
return new Duet(config); case htOctoPrint: return new OctoPrint(config);
case htSL1: return new SL1Host(config);
case htDuet: return new Duet(config);
default: return nullptr;
} }
return nullptr;
} }