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

SimpleArrangeItem now usable with arrange tasks

Browse Source 
For future comparisons and measurements
This commit is contained in:
tamasmeszaros 2023-07-26 16:15:14 +02:00
parent 355b869e0d
commit 183afab8e7
4 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Arrange/ArrangeImpl.hpp
View File

@ -123,7 +123,7 @@ void arrange(SelectionStrategy &&selstrategy,
d += corr; d += corr;
for (auto &itm : items) for (auto &itm : items)
if (itm.bed_idx() == static_cast<int>(bedidx) && !is_wipe_tower(itm)) if (get_bed_index(itm) == static_cast<int>(bedidx) && !is_wipe_tower(itm))
translate(itm, d); translate(itm, d);
} }
} }
@ -386,6 +386,7 @@ ArrItem ConvexItemConverter<ArrItem>::convert(const Arrangeable &arrbl,
set_priority(ret, arrbl.priority()); set_priority(ret, arrbl.priority());
imbue_id(ret, arrbl.id()); imbue_id(ret, arrbl.id());
if constexpr (IsWritableDataStore<ArrItem>)
arrbl.imbue_data(AnyWritableDataStore{ret}); arrbl.imbue_data(AnyWritableDataStore{ret});
return ret; return ret;
@ -401,6 +402,7 @@ ArrItem AdvancedItemConverter<ArrItem>::convert(const Arrangeable &arrbl,
set_bed_index(ret, bed_index); set_bed_index(ret, bed_index);
set_priority(ret, arrbl.priority()); set_priority(ret, arrbl.priority());
imbue_id(ret, arrbl.id()); imbue_id(ret, arrbl.id());
if constexpr (IsWritableDataStore<ArrItem>)
arrbl.imbue_data(AnyWritableDataStore{ret}); arrbl.imbue_data(AnyWritableDataStore{ret});
return ret; return ret;

9
src/libslic3r/Arrange/Items/SimpleArrangeItem.cpp
View File

@ -1,5 +1,8 @@
#include "SimpleArrangeItem.hpp" #include "SimpleArrangeItem.hpp"
#include "libslic3r/Arrange/ArrangeImpl.hpp" #include "libslic3r/Arrange/ArrangeImpl.hpp"
#include "libslic3r/Arrange/Tasks/ArrangeTaskImpl.hpp"
#include "libslic3r/Arrange/Tasks/FillBedTaskImpl.hpp"
#include "libslic3r/Arrange/Tasks/MultiplySelectionTaskImpl.hpp"
namespace Slic3r { namespace arr2 { namespace Slic3r { namespace arr2 {
@ -12,4 +15,10 @@ Polygon SimpleArrangeItem::outline() const
return ret; return ret;
} }
template class ArrangeableToItemConverter<SimpleArrangeItem>;
template struct ArrangeTask<SimpleArrangeItem>;
template struct FillBedTask<SimpleArrangeItem>;
template struct MultiplySelectionTask<SimpleArrangeItem>;
template class Arranger<SimpleArrangeItem>;
}} // namespace Slic3r::arr2 }} // namespace Slic3r::arr2

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

@ -7,6 +7,9 @@
#include "libslic3r/Arrange/Core/NFP/NFP.hpp" #include "libslic3r/Arrange/Core/NFP/NFP.hpp"
#include "libslic3r/Arrange/Arrange.hpp" #include "libslic3r/Arrange/Arrange.hpp"
#include "libslic3r/Arrange/Tasks/ArrangeTask.hpp"
#include "libslic3r/Arrange/Tasks/FillBedTask.hpp"
#include "libslic3r/Arrange/Tasks/MultiplySelectionTask.hpp"
#include "libslic3r/Polygon.hpp" #include "libslic3r/Polygon.hpp"
#include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/Geometry/ConvexHull.hpp"
@ -24,6 +27,7 @@ class SimpleArrangeItem {
int m_bed_idx = Unarranged; int m_bed_idx = Unarranged;
std::vector<double> m_allowed_rotations = {0.}; std::vector<double> m_allowed_rotations = {0.};
ObjectID m_obj_id;
public: public:
explicit SimpleArrangeItem(Polygon chull = {}): m_shape{std::move(chull)} {} explicit SimpleArrangeItem(Polygon chull = {}): m_shape{std::move(chull)} {}
@ -52,6 +56,9 @@ public:
{ {
m_allowed_rotations = std::move(rots); m_allowed_rotations = std::move(rots);
} }
void set_object_id(const ObjectID &id) noexcept { m_obj_id = id; }
const ObjectID & get_object_id() const noexcept { return m_obj_id; }
}; };
template<> struct NFPArrangeItemTraits_<SimpleArrangeItem> template<> struct NFPArrangeItemTraits_<SimpleArrangeItem>
@ -183,6 +190,29 @@ struct WritableItemTraits_<SimpleArrangeItem> {
} }
}; };
template<> struct ImbueableItemTraits_<SimpleArrangeItem>
{
static void imbue_id(SimpleArrangeItem &itm, const ObjectID &id)
{
itm.set_object_id(id);
}
static std::optional<ObjectID> retrieve_id(const SimpleArrangeItem &itm)
{
std::optional<ObjectID> ret;
if (itm.get_object_id().valid())
ret = itm.get_object_id();
return ret;
}
};
extern template class ArrangeableToItemConverter<SimpleArrangeItem>;
extern template struct ArrangeTask<SimpleArrangeItem>;
extern template struct FillBedTask<SimpleArrangeItem>;
extern template struct MultiplySelectionTask<SimpleArrangeItem>;
extern template class Arranger<SimpleArrangeItem>;
}} // namespace Slic3r::arr2 }} // namespace Slic3r::arr2
#endif // SIMPLEARRANGEITEM_HPP #endif // SIMPLEARRANGEITEM_HPP

2
src/libslic3r/Arrange/Items/WritableItemTraits.hpp
View File

@ -96,7 +96,7 @@ void set_arbitrary_data(Itm &itm, const std::string &key, T &&data)
template<class Itm> template<class Itm>
void set_allowed_rotations(Itm &itm, const std::vector<double> &rotations) void set_allowed_rotations(Itm &itm, const std::vector<double> &rotations)
{ {
WritableItemTraits<Itm>::set_arbitrary_data(itm, "rotations", rotations); WritableItemTraits<Itm>::set_allowed_rotations(itm, rotations);
} }
template<class ArrItem> int raise_priority(ArrItem &itm) template<class ArrItem> int raise_priority(ArrItem &itm)