mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-17 04:41:21 +00:00
HanifKoh
84657ff11e
* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp. * Ignore minilzo's Config Headers in clang-tidy lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes. * Add Missing Includes Across the Remaining Sources and Tests Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo. * Make the GUI and Test Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Headers that only compile on one platform, or that nothing built includes, are left alone. * Keep Windows and nanosvg Setup Ahead of the Added Includes OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build. * Add the GUI Includes the First Pass Missed Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass. * Keep the Added Test Includes Below the NOMINMAX Guard test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory, as in #16068.
108 lines
3.8 KiB
C++
108 lines
3.8 KiB
C++
#ifndef SLAIMPORTDIALOG_HPP
|
|
#define SLAIMPORTDIALOG_HPP
|
|
|
|
#include "SLAImportJob.hpp"
|
|
|
|
#include <vector>
|
|
#include <algorithm>
|
|
#include "libslic3r/Point.hpp"
|
|
#include <string>
|
|
#include <wx/dialog.h>
|
|
#include <wx/event.h>
|
|
#include <wx/gdicmn.h>
|
|
#include <wx/filedlg.h>
|
|
#include <wx/stattext.h>
|
|
#include <wx/combobox.h>
|
|
#include <wx/filename.h>
|
|
#include <wx/filepicker.h>
|
|
|
|
#include "libslic3r/AppConfig.hpp"
|
|
#include "slic3r/GUI/I18N.hpp"
|
|
|
|
#include "slic3r/GUI/GUI.hpp"
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
#include "slic3r/GUI/Plater.hpp"
|
|
|
|
// #include "libslic3r/Model.hpp"
|
|
// #include "libslic3r/PresetBundle.hpp"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
class SLAImportDialog : public wxDialog, public SLAImportJobView
|
|
{
|
|
wxFilePickerCtrl *m_filepicker;
|
|
wxComboBox *m_import_dropdown, *m_quality_dropdown;
|
|
|
|
public:
|
|
SLAImportDialog(Plater *plater) : wxDialog{plater, wxID_ANY, "Import SLA archive"}
|
|
{
|
|
auto szvert = new wxBoxSizer{wxVERTICAL};
|
|
auto szfilepck = new wxBoxSizer{wxHORIZONTAL};
|
|
|
|
m_filepicker = new wxFilePickerCtrl(this, wxID_ANY, from_u8(wxGetApp().app_config->get_last_dir()), _(L("Choose SLA archive:")),
|
|
"SL1 / SL1S archive files (*.sl1, *.sl1s, *.zip)|*.sl1;*.SL1;*.sl1s;*.SL1S;*.zip;*.ZIP",
|
|
wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE | wxFD_OPEN | wxFD_FILE_MUST_EXIST);
|
|
|
|
szfilepck->Add(new wxStaticText(this, wxID_ANY, _L("Import file") + ": "), 0, wxALIGN_CENTER);
|
|
szfilepck->Add(m_filepicker, 1);
|
|
szvert->Add(szfilepck, 0, wxALL | wxEXPAND, 5);
|
|
|
|
auto szchoices = new wxBoxSizer{wxHORIZONTAL};
|
|
|
|
static const std::vector<wxString> inp_choices = {_(L("Import model and profile")), _(L("Import profile only")),
|
|
_(L("Import model only"))};
|
|
|
|
m_import_dropdown = new wxComboBox(this, wxID_ANY, inp_choices[0], wxDefaultPosition, wxDefaultSize, inp_choices.size(),
|
|
inp_choices.data(), wxCB_READONLY | wxCB_DROPDOWN);
|
|
|
|
szchoices->Add(m_import_dropdown);
|
|
szchoices->Add(new wxStaticText(this, wxID_ANY, _L("Quality") + ": "), 0, wxALIGN_CENTER | wxALL, 5);
|
|
|
|
static const std::vector<wxString> qual_choices = {_(L("Accurate")), _(L("Balanced")), _(L("Quick"))};
|
|
|
|
m_quality_dropdown = new wxComboBox(this, wxID_ANY, qual_choices[0], wxDefaultPosition, wxDefaultSize, qual_choices.size(),
|
|
qual_choices.data(), wxCB_READONLY | wxCB_DROPDOWN);
|
|
szchoices->Add(m_quality_dropdown);
|
|
|
|
m_import_dropdown->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &) {
|
|
if (get_selection() == Sel::profileOnly)
|
|
m_quality_dropdown->Disable();
|
|
else
|
|
m_quality_dropdown->Enable();
|
|
});
|
|
|
|
szvert->Add(szchoices, 0, wxALL, 5);
|
|
szvert->AddStretchSpacer(1);
|
|
auto szbtn = new wxBoxSizer(wxHORIZONTAL);
|
|
szbtn->Add(new wxButton{this, wxID_CANCEL});
|
|
szbtn->Add(new wxButton{this, wxID_OK});
|
|
szvert->Add(szbtn, 0, wxALIGN_RIGHT | wxALL, 5);
|
|
|
|
SetSizerAndFit(szvert);
|
|
}
|
|
|
|
Sel get_selection() const override
|
|
{
|
|
int sel = m_import_dropdown->GetSelection();
|
|
return Sel(std::min(int(Sel::modelOnly), std::max(0, sel)));
|
|
}
|
|
|
|
Vec2i32 get_marchsq_windowsize() const override
|
|
{
|
|
enum { Accurate, Balanced, Fast };
|
|
|
|
switch (m_quality_dropdown->GetSelection()) {
|
|
case Fast: return {8, 8};
|
|
case Balanced: return {4, 4};
|
|
default:
|
|
case Accurate: return {2, 2};
|
|
}
|
|
}
|
|
|
|
std::string get_path() const override { return m_filepicker->GetPath().ToUTF8().data(); }
|
|
};
|
|
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif // SLAIMPORTDIALOG_HPP
|