mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-05 06:41:10 +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.
145 lines
4.5 KiB
C++
145 lines
4.5 KiB
C++
// why: match the GUI include order to avoid rpcndr.h byte/std::byte
|
|
// ambiguity in the Windows COM headers.
|
|
// why: wx/timer.h must precede DeviceManager.hpp because
|
|
// DeviceErrorDialog.hpp uses wxTimerEvent.
|
|
#ifdef WIN32
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#ifndef NOMINMAX
|
|
#define NOMINMAX
|
|
#endif
|
|
#include <Windows.h>
|
|
#endif
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include "libslic3r/ProjectTask.hpp"
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <stdexcept>
|
|
|
|
#include <wx/timer.h>
|
|
|
|
#include "slic3r/GUI/DeviceManager.hpp"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
using json = nlohmann::json;
|
|
using namespace Slic3r;
|
|
|
|
TEST_CASE("Integer progress reaches the shared subtask", "[DeviceManager][Progress]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
|
|
machine.update_print_progress(json(37));
|
|
|
|
REQUIRE(machine.mc_print_percent == 37);
|
|
BBLSubTask* subtask = machine.get_subtask();
|
|
REQUIRE(subtask != nullptr);
|
|
CHECK(subtask->task_progress == 37);
|
|
}
|
|
|
|
TEST_CASE("String progress reaches the shared subtask", "[DeviceManager][Progress]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
|
|
machine.update_print_progress(json("41"));
|
|
|
|
REQUIRE(machine.mc_print_percent == 41);
|
|
BBLSubTask* subtask = machine.get_subtask();
|
|
REQUIRE(subtask != nullptr);
|
|
CHECK(subtask->task_progress == 41);
|
|
}
|
|
|
|
TEST_CASE("Floating-point progress preserves the previous shared value", "[DeviceManager][Progress]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
|
|
machine.update_print_progress(json(29));
|
|
REQUIRE(machine.mc_print_percent == 29);
|
|
BBLSubTask* subtask = machine.get_subtask();
|
|
REQUIRE(subtask != nullptr);
|
|
REQUIRE(subtask->task_progress == 29);
|
|
|
|
machine.update_print_progress(json(29.5));
|
|
BBLSubTask* current_subtask = machine.get_subtask();
|
|
REQUIRE(current_subtask != nullptr);
|
|
REQUIRE(current_subtask == subtask);
|
|
CHECK(machine.mc_print_percent == 29);
|
|
CHECK(current_subtask->task_progress == 29);
|
|
}
|
|
|
|
TEST_CASE("Unsupported progress values leave a fresh machine unchanged", "[DeviceManager][Progress]")
|
|
{
|
|
SECTION("boolean") {
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
REQUIRE(machine.subtask_ == nullptr);
|
|
|
|
machine.update_print_progress(json(true));
|
|
|
|
CHECK(machine.mc_print_percent == 0);
|
|
CHECK(machine.subtask_ == nullptr);
|
|
}
|
|
|
|
SECTION("null") {
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
REQUIRE(machine.subtask_ == nullptr);
|
|
|
|
machine.update_print_progress(json(nullptr));
|
|
|
|
CHECK(machine.mc_print_percent == 0);
|
|
CHECK(machine.subtask_ == nullptr);
|
|
}
|
|
|
|
SECTION("object") {
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
REQUIRE(machine.subtask_ == nullptr);
|
|
|
|
machine.update_print_progress(json::object());
|
|
|
|
CHECK(machine.mc_print_percent == 0);
|
|
CHECK(machine.subtask_ == nullptr);
|
|
}
|
|
|
|
SECTION("array") {
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
REQUIRE(machine.subtask_ == nullptr);
|
|
|
|
machine.update_print_progress(json::array());
|
|
|
|
CHECK(machine.mc_print_percent == 0);
|
|
CHECK(machine.subtask_ == nullptr);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Malformed string progress leaves a fresh machine unchanged", "[DeviceManager][Progress]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
REQUIRE(machine.subtask_ == nullptr);
|
|
|
|
CHECK_NOTHROW(machine.update_print_progress(json("not-a-percent")));
|
|
CHECK(machine.mc_print_percent == 0);
|
|
CHECK(machine.subtask_ == nullptr);
|
|
}
|
|
|
|
TEST_CASE("Zero progress replaces active shared progress", "[DeviceManager][Progress]")
|
|
{
|
|
MachineObject machine(nullptr, nullptr, "test", "test-device", "127.0.0.1");
|
|
|
|
machine.update_print_progress(json(63));
|
|
BBLSubTask* subtask = machine.get_subtask();
|
|
REQUIRE(subtask != nullptr);
|
|
REQUIRE(machine.mc_print_percent == 63);
|
|
REQUIRE(subtask->task_progress == 63);
|
|
|
|
machine.set_print_state("FAILED");
|
|
machine.update_print_progress(json(0));
|
|
|
|
BBLSubTask* current_subtask = machine.get_subtask();
|
|
REQUIRE(current_subtask != nullptr);
|
|
REQUIRE(current_subtask == subtask);
|
|
REQUIRE(machine.mc_print_percent == 0);
|
|
CHECK(current_subtask->task_progress == 0);
|
|
}
|