3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix arrangement of objects larger than the print bed. Issue #2897

Browse source
This commit is contained in:
tamasmeszaros 2019-09-10 13:31:29 +02:00
parent 2fef16c39a
commit 1c20c4c43d
6 changed files with 56 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libnest2d/include/libnest2d/placers/nfpplacer.hpp
View file

@ -546,7 +546,12 @@ public:
inline explicit _NofitPolyPlacer(const BinType& bin):
Base(bin),
norm_(std::sqrt(sl::area(bin))) {}
norm_(std::sqrt(sl::area(bin)))
{
// In order to not have items out of bin, it will be shrinked by an
// very little empiric offset value.
// sl::offset(bin_, 1e-5 * norm_);
}
_NofitPolyPlacer(const _NofitPolyPlacer&) = default;
_NofitPolyPlacer& operator=(const _NofitPolyPlacer&) = default;
@ -1179,7 +1184,14 @@ private:
}
void setInitialPosition(Item& item) {
Box&& bb = item.boundingBox();
auto sh = item.rawShape();
sl::translate(sh, item.translation());
sl::rotate(sh, item.rotation());
Box bb = sl::boundingBox(sh);
bb.minCorner() += item.translation();
bb.maxCorner() += item.translation();
Vertex ci, cb;
auto bbin = sl::boundingBox(bin_);

11
src/libnest2d/include/libnest2d/selections/djd_heuristic.hpp
View file

@ -550,16 +550,7 @@ public:
return ret;
};
// Safety test: try to pack each item into an empty bin. If it fails
// then it should be removed from the not_packed list
{ auto it = store_.begin();
while (it != store_.end() && !this->stopcond_()) {
Placer p(bin); p.configure(pconfig);
if(!p.pack(*it, rem(it, store_))) {
it = store_.erase(it);
} else it++;
}
}
this->template remove_unpackable_items<Placer>(store_, bin, pconfig);
int acounter = int(store_.size());
std::atomic_flag flg = ATOMIC_FLAG_INIT;

9
src/libnest2d/include/libnest2d/selections/filler.hpp
View file

@ -30,7 +30,8 @@ public:
TBin&& bin,
PConfig&& pconfig = PConfig())
{
using Placer = PlacementStrategyLike<TPlacer>;
store_.clear();
auto total = last-first;
store_.reserve(total);
@ -57,10 +58,12 @@ public:
auto sortfunc = [](Item& i1, Item& i2) {
return i1.area() > i2.area();
};
this->template remove_unpackable_items<Placer>(store_, bin, pconfig);
std::sort(store_.begin(), store_.end(), sortfunc);
PlacementStrategyLike<TPlacer> placer(bin);
Placer placer(bin);
placer.configure(pconfig);
auto it = store_.begin();

13
src/libnest2d/include/libnest2d/selections/firstfit.hpp
View file

@ -77,17 +77,8 @@ public:
};
auto& cancelled = this->stopcond_;
// Safety test: try to pack each item into an empty bin. If it fails
// then it should be removed from the list
{ auto it = store_.begin();
while (it != store_.end() && !cancelled()) {
Placer p(bin); p.configure(pconfig);
if(!p.pack(*it)) {
it = store_.erase(it);
} else it++;
}
}
this->template remove_unpackable_items<Placer>(store_, bin, pconfig);
auto it = store_.begin();

15
src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp
View file

@ -25,6 +25,21 @@ public:
inline void clear() { packed_bins_.clear(); }
protected:
template<class Placer, class Container, class Bin, class PCfg>
void remove_unpackable_items(Container &c, const Bin &bin, const PCfg& pcfg)
{
// Safety test: try to pack each item into an empty bin. If it fails
// then it should be removed from the list
auto it = c.begin();
while (it != c.end() && !stopcond_()) {
Placer p{bin};
p.configure(pcfg);
Item cpy{*it};
if (!p.pack(cpy)) it = c.erase(it);
else it++;
}
}
PackGroup packed_bins_;
ProgressFunction progress_ = [](unsigned){};