3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 08:41:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Unite cancel callback and status function

Browse source
This commit is contained in:
tamasmeszaros 2021-03-18 09:37:46 +01:00
parent de8bb00fa9
commit 46fd722f3c
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libslic3r/SLA/Rotfinder.cpp
View file

@ -92,10 +92,9 @@ Transform3f to_transform3f(const XYRotation &rot)
} // namespace
Vec2d find_best_rotation(const SLAPrintObject & po,
float accuracy,
std::function<void(unsigned)> statuscb,
std::function<bool()> stopcond)
Vec2d find_best_rotation(const SLAPrintObject & po,
float accuracy,
std::function<bool(int)> statuscb)
{
static const unsigned MAX_TRIES = 1000;
@ -108,7 +107,7 @@ Vec2d find_best_rotation(const SLAPrintObject & po,
mesh.require_shared_vertices();
// To keep track of the number of iterations
unsigned status = 0;
int status = 0;
// The maximum number of iterations
auto max_tries = unsigned(accuracy * MAX_TRIES);
@ -118,7 +117,11 @@ Vec2d find_best_rotation(const SLAPrintObject & po,
auto statusfn = [&statuscb, &status, &max_tries] {
// report status
statuscb(unsigned(++status * 100.0/max_tries) );
statuscb(++status * 100.0/max_tries);
};
auto stopcond = [&statuscb] {
return ! statuscb(-1);
};
// Preparing the optimizer.