mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-12 18:31:18 +00:00
Kris Austin
56f9edc572
* chore: mark every declaration that overrides a base virtual clang-cl reports 42 member functions across 28 files that override a base virtual without being marked `override`, inside classes that already mark their other overrides. That is every occurrence of -Winconsistent-missing-override in the tree, so the category drops to zero and -Werror=inconsistent-missing-override becomes available as a guard against it coming back. Behaviour is unchanged. Each keyword goes only where clang had already resolved the declaration to a base virtual, so it records what the compiler already worked out and cannot affect overload resolution or dispatch. If any of these signatures had not really overridden a base method, the build would have failed rather than warned. Where a declaration already carried `virtual` it is left alone and the keyword appended, matching the surrounding declarations. Plain `override` is used rather than the wxWidgets `wxOVERRIDE` macro, which wx/defs.h defines as `override` beneath a comment marking it obsolete, and which the rest of src/slic3r already avoids by 1742 occurrences to 113. A full clang-cl build takes -Winconsistent-missing-override from 1,146 warning lines to 0. Those 42 declarations produce that many lines because a header is re-diagnosed in every translation unit that includes it. CalibrationWizardStartPage.hpp alone accounts for 336 of them from 4 declarations. * chore: drop unused lambda captures in GUI/Widgets clang-cl reports 10 lambda captures in src/slic3r/GUI/Widgets that are never read. Removing them changes nothing at runtime. Every capture removed is `this` or a raw pointer. clang does not report a capture whose type has a non-trivial destructor, since such a capture can be held purely for its effect on an object's lifetime, so nothing that owns or extends a lifetime is touched. The std::weak_ptr captured beside the removed `this` in MultiNozzleSync.cpp stays. This clears the category in GUI/Widgets only. A full clang-cl build takes -Wunused-lambda-capture from 312 warning lines to 302, leaving 235 sites in other directories for a follow-up.
101 lines
4.1 KiB
C++
101 lines
4.1 KiB
C++
#ifndef slic3r_ElegooLink_hpp_
|
|
#define slic3r_ElegooLink_hpp_
|
|
|
|
#include <string>
|
|
#include <wx/string.h>
|
|
#include <boost/optional.hpp>
|
|
#include <boost/asio/ip/address.hpp>
|
|
|
|
#include "PrintHost.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "OctoPrint.hpp"
|
|
#include "WebSocketClient.hpp"
|
|
namespace Slic3r {
|
|
|
|
class DynamicPrintConfig;
|
|
class Http;
|
|
|
|
class ElegooLink : public OctoPrint
|
|
{
|
|
public:
|
|
ElegooLink(DynamicPrintConfig *config);
|
|
~ElegooLink() override = default;
|
|
static std::string get_print_host_webui(DynamicPrintConfig *config);
|
|
const char* get_name() const override;
|
|
virtual 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, InfoFn info_fn) const override;
|
|
std::string get_sn() const override;
|
|
bool has_auto_discovery() const override { return false; }
|
|
bool can_test() const override { return true; }
|
|
PrintHostPostUploadActions get_post_upload_actions() const override;
|
|
protected:
|
|
#ifdef WIN32
|
|
virtual bool upload_inner_with_resolved_ip(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn, const boost::asio::ip::address& resolved_addr) const override;
|
|
#endif
|
|
virtual bool validate_version_text(const boost::optional<std::string> &version_text) const override;
|
|
virtual bool upload_inner_with_host(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const override;
|
|
|
|
#ifdef WIN32
|
|
virtual bool test_with_resolved_ip(wxString& curl_msg) const override;
|
|
bool elegoo_test_with_resolved_ip(wxString& curl_msg) const;
|
|
#endif
|
|
private:
|
|
bool elegoo_test(wxString& curl_msg) const;
|
|
bool elegoo_cc2_test(wxString& curl_msg) const;
|
|
bool print(WebSocketClient& client,
|
|
std::string timeLapse,
|
|
std::string heatedBedLeveling,
|
|
std::string bedType,
|
|
const std::string filename, ErrorFn error_fn) const;
|
|
bool checkResult(WebSocketClient& client,
|
|
ErrorFn error_fn) const;
|
|
|
|
bool loopUpload(std::string url, PrintHostUpload upload_data,
|
|
ProgressFn prorgess_fn,
|
|
ErrorFn error_fn,
|
|
InfoFn info_fn) const;
|
|
bool loopUploadCC2(std::string url,
|
|
const std::string& host_header,
|
|
PrintHostUpload upload_data,
|
|
ProgressFn prorgess_fn,
|
|
ErrorFn error_fn,
|
|
InfoFn info_fn) const;
|
|
|
|
bool uploadPart(Http &http,
|
|
std::string md5,
|
|
std::string uuid,
|
|
std::string path,
|
|
std::string filename,
|
|
size_t filesize,
|
|
size_t offset,
|
|
size_t length,
|
|
ProgressFn prorgess_fn,
|
|
ErrorFn error_fn,
|
|
InfoFn info_fn) const;
|
|
bool uploadPartCC2(Http& http,
|
|
const std::string& host_header,
|
|
const std::string& token,
|
|
const std::string& md5,
|
|
const boost::filesystem::path& path,
|
|
const std::string& filename,
|
|
size_t filesize,
|
|
size_t offset,
|
|
size_t length,
|
|
ProgressFn prorgess_fn,
|
|
ErrorFn error_fn) const;
|
|
|
|
std::string cc2_token() const;
|
|
std::string make_cc2_info_url() const;
|
|
std::string make_cc2_upload_url() const;
|
|
#ifdef WIN32
|
|
bool elegoo_cc2_test_with_resolved_ip(wxString& curl_msg) const;
|
|
#endif
|
|
|
|
std::string m_printerModel;
|
|
};
|
|
}
|
|
|
|
#endif
|