GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 12:42:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented slice() without error detection, refactored some of the syntax around for loops and accessing items.

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-21 18:52:28 -05:00
parent ac1152f42d
commit c989c88a0c
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xs/src/libslic3r/PrintObject.cpp
View File

@ -925,10 +925,10 @@ PrintObject::_slice_region(size_t region_id, std::vector<float> z, bool modifier
// compose mesh // compose mesh
TriangleMesh mesh; TriangleMesh mesh;
for (std::vector<int>::const_iterator it = region_volumes.begin(); for (const auto& i : region_volumes) {
it != region_volumes.end(); ++it) {
const ModelVolume &volume = *object.volumes[*it]; const ModelVolume &volume = *(object.volumes[i]);
if (volume.modifier != modifier) continue; if (volume.modifier != modifier) continue;
mesh.merge(volume.mesh); mesh.merge(volume.mesh);
@ -958,13 +958,43 @@ PrintObject::make_perimeters()
if (this->state.is_done(posPerimeters)) return; if (this->state.is_done(posPerimeters)) return;
if (this->typed_slices) if (this->typed_slices)
this->state.invalidate(posSlice); this->state.invalidate(posSlice);
this->slice(); this->slice(); // take care of prereqs
this->_make_perimeters(); this->_make_perimeters();
} }
void void
PrintObject::slice() PrintObject::slice()
{ {
auto* print {this->print()};
if (this->state.is_done(posSlice)) return;
this->state.set_started(posSlice);
if (print->status_cb != nullptr) {
print->status_cb(10, "Processing triangulated mesh");
}
this->_slice();
// detect slicing errors
bool warning_thrown = false;
for (size_t i = 0U; i < this->layer_count(); ++i) {
auto* layer {this->get_layer(i)};
if (!layer->slicing_errors) continue;
if (!warning_thrown) {
Slic3r::Log::warn("PrintObject") << "The model has overlapping or self-intersecting facets. "
<< "I tried to repair it, however you might want to check "
<< "the results or repair the input file and retry.\n";
warning_thrown = true;
}
}
if (this->layers.size() == 0) {
Slic3r::Log::error("PrintObject") << "slice(): " << "No layers were detected. You might want to repair your STL file(s) or check their size or thickness and retry.\n";
return; // make this throw an exception instead?
}
this->typed_slices = false;
this->state.set_done(posSlice);
} }
void void