mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: layer height 5.99999 should be same with 6.0 

Merge numerically very close Z values when calculate
total layer number

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4e60ca69fe5b06b66283d6a763d0b231c3d11b5a
This commit is contained in:
salt.wei 2023-01-28 16:43:11 +08:00 committed by Lane.Wei
parent 7335f5d015
commit 7dcb5c0e64
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libslic3r/GCode.cpp
View File

@ -1422,29 +1422,40 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
if (print.config().print_sequence == PrintSequence::ByObject) { if (print.config().print_sequence == PrintSequence::ByObject) {
// Add each of the object's layers separately. // Add each of the object's layers separately.
for (auto object : print.objects()) { for (auto object : print.objects()) {
//BBS: fix the issue that total layer is not right std::vector<coordf_t> zs;
std::vector<coord_t> zs;
zs.reserve(object->layers().size() + object->support_layers().size()); zs.reserve(object->layers().size() + object->support_layers().size());
for (auto layer : object->layers()) for (auto layer : object->layers())
zs.push_back((coord_t)(layer->print_z / EPSILON)); zs.push_back(layer->print_z);
for (auto layer : object->support_layers()) for (auto layer : object->support_layers())
zs.push_back((coord_t)(layer->print_z / EPSILON)); zs.push_back(layer->print_z);
std::sort(zs.begin(), zs.end()); std::sort(zs.begin(), zs.end());
m_layer_count += (unsigned int)(object->instances().size() * (std::unique(zs.begin(), zs.end()) - zs.begin())); //BBS: merge numerically very close Z values.
auto end_it = std::unique(zs.begin(), zs.end());
unsigned int temp_layer_count = (unsigned int)(end_it - zs.begin());
for (auto it = zs.begin(); it != end_it - 1; it++) {
if (abs(*it - *(it + 1)) < EPSILON)
temp_layer_count--;
}
m_layer_count += (unsigned int)(object->instances().size() * temp_layer_count);
} }
} else { } else {
// Print all objects with the same print_z together. // Print all objects with the same print_z together.
//BBS: fix the issue that total layer is not right std::vector<coordf_t> zs;
std::vector<coord_t> zs;
for (auto object : print.objects()) { for (auto object : print.objects()) {
zs.reserve(zs.size() + object->layers().size() + object->support_layers().size()); zs.reserve(zs.size() + object->layers().size() + object->support_layers().size());
for (auto layer : object->layers()) for (auto layer : object->layers())
zs.push_back((coord_t)(layer->print_z / EPSILON)); zs.push_back(layer->print_z);
for (auto layer : object->support_layers()) for (auto layer : object->support_layers())
zs.push_back((coord_t)(layer->print_z / EPSILON)); zs.push_back(layer->print_z);
} }
std::sort(zs.begin(), zs.end()); std::sort(zs.begin(), zs.end());
m_layer_count = (unsigned int)(std::unique(zs.begin(), zs.end()) - zs.begin()); //BBS: merge numerically very close Z values.
auto end_it = std::unique(zs.begin(), zs.end());
m_layer_count = (unsigned int)(end_it - zs.begin());
for (auto it = zs.begin(); it != end_it - 1; it++) {
if (abs(*it - *(it + 1)) < EPSILON)
m_layer_count--;
}
} }
print.throw_if_canceled(); print.throw_if_canceled();