From cdf3f294966d27141da8ed4fac77a948a94e33ad Mon Sep 17 00:00:00 2001 From: igiannakas <59056762+igiannakas@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:19:06 +0100 Subject: [PATCH] Attempting to fix "set started" not being set --- src/libslic3r/Print.cpp | 10 +++++++++- src/libslic3r/Print.hpp | 4 ++-- src/libslic3r/PrintObject.cpp | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index dbf71827be..e3284c09e9 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -1666,6 +1666,15 @@ void Print::process(bool use_cache) obj->set_done(posPerimeters); } } + for (PrintObject *obj : m_objects) { + if (need_slicing_objects.count(obj) != 0) { + obj->estimate_curled_extrusions(); + } + else { + if (obj->set_started(posEstimateCurledExtrusions)) + obj->set_done(posEstimateCurledExtrusions); + } + } for (PrintObject *obj : m_objects) { if (need_slicing_objects.count(obj) != 0) { obj->infill(); @@ -1693,7 +1702,6 @@ void Print::process(bool use_cache) PrintObject* obj = m_objects[i]; if (need_slicing_objects.count(obj) != 0) { obj->generate_support_material(); - obj->estimate_curled_extrusions(); } else { if (obj->set_started(posSupportMaterial)) diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp index 590bbb1af5..00ad8de36a 100644 --- a/src/libslic3r/Print.hpp +++ b/src/libslic3r/Print.hpp @@ -87,8 +87,8 @@ enum PrintStep { }; enum PrintObjectStep { - posSlice, posPerimeters, posPrepareInfill, - posInfill, posIroning, posSupportMaterial, posSimplifyPath, posSimplifySupportPath, posEstimateCurledExtrusions, + posSlice, posPerimeters,posEstimateCurledExtrusions, posPrepareInfill, + posInfill, posIroning, posSupportMaterial, posSimplifyPath, posSimplifySupportPath, // BBS posSimplifyInfill, posDetectOverhangsForLift, diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 2af52f24d1..8f8a8f250c 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -502,7 +502,7 @@ void PrintObject::generate_support_material() void PrintObject::estimate_curled_extrusions() { if (this->set_started(posEstimateCurledExtrusions)) { - //printf("Estimating curled Extrusions \n"); + printf("Estimating curled Extrusions \n"); if ( std::any_of(this->print()->m_print_regions.begin(), this->print()->m_print_regions.end(), [](const PrintRegion *region) { return region->config().enable_overhang_speed.getBool(); })) {