mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-18 22:42:37 +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.
86 lines
2.6 KiB
C++
86 lines
2.6 KiB
C++
#ifndef slic3r_GUI_CalibrationWizardStartPage_hpp_
|
|
#define slic3r_GUI_CalibrationWizardStartPage_hpp_
|
|
|
|
#include "CalibrationWizardPage.hpp"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
|
|
|
|
class CalibrationStartPage : public CalibrationWizardPage
|
|
{
|
|
public:
|
|
CalibrationStartPage(wxWindow* parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL);
|
|
|
|
protected:
|
|
CalibMode m_cali_mode;
|
|
|
|
wxBoxSizer* m_top_sizer{ nullptr };
|
|
wxBoxSizer* m_images_sizer{ nullptr };
|
|
Label* m_when_title{ nullptr };
|
|
Label* m_when_content{ nullptr };
|
|
Label* m_about_title{ nullptr };
|
|
Label* m_about_content{ nullptr };
|
|
wxStaticBitmap* m_before_bmp{ nullptr };
|
|
wxStaticBitmap* m_after_bmp{ nullptr };
|
|
wxStaticBitmap* m_bmp_intro{ nullptr };
|
|
PAPageHelpPanel* m_help_panel{ nullptr };
|
|
|
|
void create_when(wxWindow* parent, wxString title, wxString content);
|
|
void create_about(wxWindow* parent, wxString title, wxString content);
|
|
void create_bitmap(wxWindow* parent, const wxBitmap& before_img, const wxBitmap& after_img);
|
|
void create_bitmap(wxWindow* parent, std::string before_img, std::string after_img);
|
|
void create_bitmap(wxWindow* parent, std::string img);
|
|
};
|
|
|
|
class CalibrationPAStartPage : public CalibrationStartPage
|
|
{
|
|
public:
|
|
CalibrationPAStartPage(wxWindow* parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL);
|
|
|
|
void create_page(wxWindow* parent);
|
|
|
|
void on_reset_page() override;
|
|
void on_device_connected(MachineObject* obj) override;
|
|
void msw_rescale() override;
|
|
};
|
|
|
|
class CalibrationFlowRateStartPage : public CalibrationStartPage
|
|
{
|
|
public:
|
|
CalibrationFlowRateStartPage(wxWindow* parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL);
|
|
|
|
void create_page(wxWindow* parent);
|
|
void on_reset_page() override;
|
|
void on_device_connected(MachineObject* obj) override;
|
|
void msw_rescale() override;
|
|
};
|
|
|
|
class CalibrationMaxVolumetricSpeedStartPage : public CalibrationStartPage
|
|
{
|
|
public:
|
|
CalibrationMaxVolumetricSpeedStartPage(wxWindow* parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL);
|
|
|
|
void create_page(wxWindow* parent);
|
|
void msw_rescale() override;
|
|
};
|
|
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif |