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.
115 lines
3.4 KiB
C++
115 lines
3.4 KiB
C++
#include <catch2/catch_all.hpp>
|
|
|
|
#include <algorithm>
|
|
#include "libslic3r/CustomGCode.hpp"
|
|
#include <sstream>
|
|
#include <string>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/matchers/catch_matchers.hpp>
|
|
#include <catch2/matchers/catch_matchers_floating_point.hpp>
|
|
#include "libslic3r/calib.hpp"
|
|
#include "libslic3r/Model.hpp"
|
|
#include "libslic3r/TriangleMesh.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
|
|
using namespace Slic3r;
|
|
|
|
namespace {
|
|
|
|
// The width-resolution getters are protected; expose them so the resolution can be asserted directly.
|
|
struct PaPatternProbe : public CalibPressureAdvancePattern
|
|
{
|
|
using CalibPressureAdvancePattern::CalibPressureAdvancePattern;
|
|
using CalibPressureAdvancePattern::line_width;
|
|
using CalibPressureAdvancePattern::line_width_first_layer;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("Zero calibration line width resolves to a positive default", "[Calib][Regression]")
|
|
{
|
|
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
|
config.set_deserialize_strict({
|
|
{"line_width", "0"},
|
|
{"initial_layer_line_width", "0"},
|
|
});
|
|
|
|
Model model;
|
|
model.add_object("cube", "", make_cube(20, 20, 20))->add_instance();
|
|
|
|
Calib_Params params;
|
|
params.mode = CalibMode::Calib_PA_Pattern;
|
|
|
|
PaPatternProbe pattern(params, config, /* is_bbl_machine */ true, *model.objects.front(), Vec3d(0, 0, 0));
|
|
|
|
REQUIRE(pattern.line_width() > 0.);
|
|
REQUIRE(pattern.line_width_first_layer() > 0.);
|
|
}
|
|
|
|
namespace {
|
|
|
|
struct EndState { double final_e; double max_e; };
|
|
|
|
EndState simulate_absolute_e(const std::string &gcode)
|
|
{
|
|
double final_e = 0.;
|
|
double max_e = 0.;
|
|
|
|
std::istringstream lines(gcode);
|
|
std::string line;
|
|
while (std::getline(lines, line)) {
|
|
std::istringstream words(line);
|
|
std::string op;
|
|
if (!(words >> op))
|
|
continue;
|
|
if (op != "G1" && op != "G0" && op != "G92")
|
|
continue;
|
|
|
|
std::string word;
|
|
while (words >> word) {
|
|
if (word.size() >= 2 && word[0] == 'E') {
|
|
final_e = std::stod(word.substr(1));
|
|
max_e = std::max(max_e, final_e);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
return {final_e, max_e};
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("PA pattern resets the extruder after the final layer in absolute E mode", "[Calib][Regression]")
|
|
{
|
|
DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
|
|
config.set_deserialize_strict({
|
|
{"use_relative_e_distances", "0"},
|
|
{"line_width", "0.45"},
|
|
{"initial_layer_line_width", "0.45"},
|
|
});
|
|
|
|
Model model;
|
|
model.add_object("cube", "", make_cube(20, 20, 20))->add_instance();
|
|
|
|
Calib_Params params;
|
|
params.mode = CalibMode::Calib_PA_Pattern;
|
|
params.start = 0.;
|
|
params.end = 0.08;
|
|
params.step = 0.002;
|
|
|
|
CalibPressureAdvancePattern pattern(params, config, /* is_bbl_machine */ false, *model.objects.front(), Vec3d(0, 0, 0));
|
|
const CustomGCode::Info info = pattern.generate_custom_gcodes(config, /* is_bbl_machine */ false, *model.objects.front(),
|
|
Vec3d(0, 0, 0));
|
|
|
|
std::string gcode;
|
|
for (const CustomGCode::Item &item : info.gcodes)
|
|
gcode += item.extra;
|
|
|
|
const EndState state = simulate_absolute_e(gcode);
|
|
|
|
REQUIRE(state.max_e > 1.);
|
|
REQUIRE_THAT(state.final_e, Catch::Matchers::WithinAbs(0., 1e-9));
|
|
}
|