mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +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.
45 lines
2.5 KiB
C++
45 lines
2.5 KiB
C++
#include <catch2/catch_all.hpp>
|
|
#include <string>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/catch_message.hpp>
|
|
#include "libslic3r/Preset.hpp"
|
|
|
|
using namespace Slic3r;
|
|
|
|
// Golden vectors from the Python reference generate_preset_setting_id (defined in
|
|
// scripts/orca_profile_tool.py). The C++ generate_preset_setting_id() MUST stay byte-identical
|
|
// to it, otherwise app-side on-the-fly ids would diverge from the
|
|
// script-assigned ones in the profiles. Regenerate a vector with:
|
|
// python3 -c "import sys; sys.path.insert(0, 'scripts'); from orca_profile_tool import generate_preset_setting_id as g; print(g('Afinia','filament','Afinia ABS @Afinia H400'))"
|
|
TEST_CASE("preset setting_id matches the Python reference", "[Preset][setting_id]") {
|
|
struct Vec { const char* vendor; const char* type; const char* name; const char* expected; };
|
|
const Vec vectors[] = {
|
|
{"Afinia", "filament", "Afinia ABS @Afinia H400", "TL34qSVkppBvMvgH"},
|
|
{"Afinia", "process", "0.20mm Standard @Afinia H400", "FzmtNsy7XQvpd7w0"},
|
|
{"Afinia", "machine", "Afinia H400 0.4 nozzle", "r4FZagW0S8uoaJPd"},
|
|
{"Anycubic", "filament", "Generic PLA @Anycubic Kobra 2", "YIWGGLQ8Oepd30Fv"},
|
|
{"Creality", "process", "0.16mm Optimal @Creality Ender-3 V3", "2Nrbq8PxssUPBLza"},
|
|
{"Elegoo", "machine", "Elegoo Neptune 4 0.4 nozzle", "69QdWuRQwAZk9rFu"},
|
|
};
|
|
|
|
for (const auto& v : vectors) {
|
|
const std::string id = generate_preset_setting_id(v.vendor, v.type, v.name);
|
|
INFO(v.vendor << "/" << v.type << "/" << v.name);
|
|
CHECK(id.size() == 16);
|
|
CHECK(id == v.expected);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("preset setting_id is deterministic and identity-sensitive", "[Preset][setting_id]") {
|
|
const std::string a = generate_preset_setting_id("VendorX", "filament", "My PLA");
|
|
CHECK(a == generate_preset_setting_id("VendorX", "filament", "My PLA")); // stable
|
|
CHECK(a != generate_preset_setting_id("VendorY", "filament", "My PLA")); // vendor matters
|
|
CHECK(a != generate_preset_setting_id("VendorX", "process", "My PLA")); // type matters
|
|
CHECK(a != generate_preset_setting_id("VendorX", "filament", "My PETG")); // name matters
|
|
|
|
// Empty identity yields no id (callers must not assign one).
|
|
CHECK(generate_preset_setting_id("", "filament", "My PLA").empty());
|
|
CHECK(generate_preset_setting_id("VendorX", "filament", "").empty());
|
|
}
|