mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 06:11:02 +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.
59 lines
2.7 KiB
C++
59 lines
2.7 KiB
C++
#include <catch2/catch_all.hpp>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/generators/catch_generators.hpp>
|
|
#include "libslic3r/Preset.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
|
|
#include <algorithm>
|
|
#include "libslic3r/Config.hpp"
|
|
#include <vector>
|
|
#include <cstddef>
|
|
#include <string>
|
|
|
|
using namespace Slic3r;
|
|
|
|
// Regression test for the python-plugin branch's intentional divergence from
|
|
// upstream in add_correct_opts_to_diff() (src/libslic3r/Preset.cpp): a vector
|
|
// option entry whose index is beyond the reference vector's length is reported
|
|
// dirty even when it duplicates an existing value. On main these duplicates
|
|
// were NOT flagged. See the comment on add_correct_opts_to_diff() in src/libslic3r/Preset.cpp.
|
|
TEST_CASE("deep_diff flags new vector entries that duplicate values[0]", "[PresetDiff][Config]")
|
|
{
|
|
// reference: single-extruder vector (one entry)
|
|
Preset reference(Preset::TYPE_PRINTER, "ref");
|
|
reference.config.set_key_value("nozzle_diameter", new ConfigOptionFloats{0.4});
|
|
|
|
// edited: a second extruder entry was added whose value duplicates the first
|
|
Preset edited(Preset::TYPE_PRINTER, "edited");
|
|
edited.config.set_key_value("nozzle_diameter", new ConfigOptionFloats{0.4, 0.4});
|
|
|
|
// deep_compare = true routes through deep_diff() -> add_correct_opts_to_diff()
|
|
std::vector<std::string> diff =
|
|
PresetCollection::dirty_options(&edited, &reference, /*deep_compare=*/true);
|
|
|
|
// The new index #1 is reported dirty even though 0.4 == values[0] (0.4).
|
|
REQUIRE(std::find(diff.begin(), diff.end(), "nozzle_diameter#1") != diff.end());
|
|
|
|
// Sanity: the unchanged existing index #0 is NOT reported, so the rule is
|
|
// specific to new indices rather than flagging the whole vector.
|
|
REQUIRE(std::find(diff.begin(), diff.end(), "nozzle_diameter#0") == diff.end());
|
|
}
|
|
|
|
TEST_CASE("deep_diff distinguishes absolute and percentage speeds for each variant", "[PresetDiff][Config]")
|
|
{
|
|
const size_t changed_index = GENERATE(size_t(0), size_t(1));
|
|
Preset reference(Preset::TYPE_PRINT, "ref");
|
|
reference.config.set_key_value("small_perimeter_speed", new ConfigOptionFloatsOrPercents{{50., false}, {50., false}});
|
|
|
|
Preset edited = reference;
|
|
edited.config.option<ConfigOptionFloatsOrPercents>("small_perimeter_speed")->values[changed_index].percent = true;
|
|
|
|
const auto diff = PresetCollection::dirty_options(&edited, &reference, /*deep_compare=*/true);
|
|
REQUIRE(diff == std::vector<std::string>{"small_perimeter_speed#" + std::to_string(changed_index)});
|
|
|
|
DynamicPrintConfig transferred = reference.config;
|
|
transferred.apply_only(edited.config, diff);
|
|
REQUIRE(*transferred.option("small_perimeter_speed") == *edited.config.option("small_perimeter_speed"));
|
|
}
|