GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 10:35:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing tests

Browse Source
This commit is contained in:
tamasmeszaros 2023-07-24 11:14:27 +02:00
parent 2730d2e14f
commit e4a1df0add
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Arrange/Items/SimpleArrangeItem.hpp
View File

@ -141,12 +141,12 @@ template<> struct NFPArrangeItemTraits_<SimpleArrangeItem>
static Vec2crd fixed_centroid(const SimpleArrangeItem &itm) noexcept static Vec2crd fixed_centroid(const SimpleArrangeItem &itm) noexcept
{ {
return itm.shape().centroid(); return itm.outline().centroid();
} }
static Vec2crd envelope_centroid(const SimpleArrangeItem &itm) noexcept static Vec2crd envelope_centroid(const SimpleArrangeItem &itm) noexcept
{ {
return itm.shape().centroid(); return itm.outline().centroid();
} }
}; };

5
tests/arrange/test_arrange.cpp
View File

@ -937,7 +937,8 @@ TEST_CASE("Optimal nfp position search with GravityKernel using RectangleItem an
} }
} }
TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]") TEMPLATE_TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]",
Slic3r::arr2::SimpleArrangeItem, Slic3r::arr2::ArrangeItem)
{ {
using Slic3r::arr2::RectangleOverfitPackingStrategy; using Slic3r::arr2::RectangleOverfitPackingStrategy;
using Slic3r::arr2::PackStrategyNFP; using Slic3r::arr2::PackStrategyNFP;
@ -946,7 +947,7 @@ TEST_CASE("RectangleOverfitPackingStrategy test", "[arrange2]")
namespace firstfit = Slic3r::arr2::firstfit; namespace firstfit = Slic3r::arr2::firstfit;
using ArrItem = Slic3r::arr2::SimpleArrangeItem; using ArrItem = TestType;
auto frontleft_align_fn = [](const Slic3r::BoundingBox &bedbb, auto frontleft_align_fn = [](const Slic3r::BoundingBox &bedbb,
const Slic3r::BoundingBox &pilebb) { const Slic3r::BoundingBox &pilebb) {