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

Print host: Check OctoPrint vs SLA

Browse source
This commit is contained in:
Vojtech Kral 2018-12-19 15:00:30 +01:00
parent 2548253d59
commit 0ac4d13015
5 changed files with 65 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/slic3r/Utils/OctoPrint.hpp
View file

@ -3,6 +3,7 @@
#include <string>
#include <wx/string.h>
#include <boost/optional.hpp>
#include "PrintHost.hpp"
@ -19,16 +20,16 @@ public:
OctoPrint(DynamicPrintConfig *config);
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 bool test(wxString &curl_msg) const;
virtual wxString get_test_ok_msg () const;
virtual wxString get_test_failed_msg (wxString &msg) const;
virtual bool upload(PrintHostUpload upload_data, Http::ProgressFn prorgess_fn, Http::ErrorFn error_fn) const;
virtual bool has_auto_discovery() const;
virtual bool can_test() const;
virtual std::string get_host() const { return host; }
protected:
virtual bool validate_version_text(const std::string &version_text);
virtual bool validate_version_text(const boost::optional<std::string> &version_text) const;
private:
std::string host;
@ -41,14 +42,16 @@ private:
};
class SL1Host: public OctoPrint
class SLAHost: public OctoPrint
{
public:
SL1Host(DynamicPrintConfig *config) : OctoPrint(config) {}
virtual ~SL1Host();
SLAHost(DynamicPrintConfig *config) : OctoPrint(config) {}
virtual ~SLAHost();
virtual wxString get_test_ok_msg () const;
virtual wxString get_test_failed_msg (wxString &msg) const;
protected:
virtual bool validate_version_text(const std::string &version_text);
virtual bool validate_version_text(const boost::optional<std::string> &version_text) const;
};