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

Clean-up of the "Upload to" code (AstroBox, Duet, FlashAir, OctoPrint)

Browse source
This commit is contained in:
bubnikv 2020-01-06 10:59:46 +01:00
parent b08a315a46
commit 791f487c76
8 changed files with 48 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,6 @@
namespace Slic3r {
class DynamicPrintConfig;
class Http;
@ -18,18 +17,18 @@ class OctoPrint : public PrintHost
{
public:
OctoPrint(DynamicPrintConfig *config);
virtual ~OctoPrint();
~OctoPrint() override = default;
virtual const char* get_name() const;
const char* get_name() 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, ProgressFn prorgess_fn, ErrorFn error_fn) const;
virtual bool has_auto_discovery() const;
virtual bool can_test() const;
virtual bool can_start_print() const;
virtual std::string get_host() const { return host; }
bool test(wxString &curl_msg) const override;
wxString get_test_ok_msg () const override;
wxString get_test_failed_msg (wxString &msg) const override;
bool upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn) const override;
bool has_auto_discovery() const override { return true; }
bool can_test() const override { return true; }
bool can_start_print() const override { return true; }
std::string get_host() const override { return host; }
protected:
virtual bool validate_version_text(const boost::optional<std::string> &version_text) const;
@ -43,23 +42,22 @@ private:
std::string make_url(const std::string &path) const;
};
class SL1Host: public OctoPrint
{
public:
SL1Host(DynamicPrintConfig *config) : OctoPrint(config) {}
virtual ~SL1Host();
~SL1Host() override = default;
virtual const char* get_name() const;
const char* get_name() const override;
wxString get_test_ok_msg() const override;
wxString get_test_failed_msg(wxString &msg) const override;
bool can_start_print() const override { return false; }
virtual wxString get_test_ok_msg () const;
virtual wxString get_test_failed_msg (wxString &msg) const;
virtual bool can_start_print() const ;
protected:
virtual bool validate_version_text(const boost::optional<std::string> &version_text) const;
bool validate_version_text(const boost::optional<std::string> &version_text) const override;
};
}
#endif