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

ENH: merge all error when multi obj have empty layer

Browse source 
Change-Id: Iff091babff67050fe512a3cffe6cb2af0e91efa5

STUDIO-2540
(cherry picked from commit e23781245e3a6ae9bffcff869aa8991eb0298243)

Change-Id: Ia90ffa1244ef8a89c8d3007ca65b68439b09249b
This commit is contained in:
manch1n 2023-05-09 12:22:42 +08:00 • committed by Lane.Wei
parent 81319b6a9e
commit 35d6b072d3
8 changed files with 73 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/Exception.hpp
View file

@ -2,6 +2,7 @@
#define _libslic3r_Exception_h_
#include <stdexcept>
#include <vector>
namespace Slic3r {
@ -35,6 +36,16 @@ public:
private:
size_t objectId_ = 0;
};
class SlicingErrors : public Exception
{
public:
using Exception::Exception;
SlicingErrors(const std::vector<SlicingError> &errors) : Exception("Errors"), errors_(errors) {}
std::vector<SlicingError> errors_;
};
#undef SLIC3R_DERIVE_EXCEPTION
} // namespace Slic3r

14
src/libslic3r/GCode.cpp
View file

@ -808,7 +808,7 @@ std::vector<GCode::LayerToPrint> GCode::collect_layers_to_print(const PrintObjec
// first layer may result in skirt/brim in the air and maybe other issues.
if (layers_to_print.size() == 1u) {
if (!has_extrusions)
throw Slic3r::SlicingError(_(L("One object has empty initial layer and can't be printed. Please Cut the bottom or enable supports.")), object.id().id);
throw Slic3r::SlicingError(_(L("The following object(s) have empty initial layer and can't be printed. Please Cut the bottom or enable supports.")), object.id().id);
}
// In case there are extrusions on this layer, check there is a layer to lay it on.
@ -863,8 +863,16 @@ std::vector<std::pair<coordf_t, std::vector<GCode::LayerToPrint>>> GCode::collec
std::vector<std::vector<LayerToPrint>> per_object(print.objects().size(), std::vector<LayerToPrint>());
std::vector<OrderingItem> ordering;
std::vector<Slic3r::SlicingError> errors;
for (size_t i = 0; i < print.objects().size(); ++i) {
per_object[i] = collect_layers_to_print(*print.objects()[i]);
try {
per_object[i] = collect_layers_to_print(*print.objects()[i]);
} catch (const Slic3r::SlicingError &e) {
errors.push_back(e);
continue;
}
OrderingItem ordering_item;
ordering_item.object_idx = i;
ordering.reserve(ordering.size() + per_object[i].size());
@ -875,6 +883,8 @@ std::vector<std::pair<coordf_t, std::vector<GCode::LayerToPrint>>> GCode::collec
ordering.emplace_back(ordering_item);
}
}
if (!errors.empty()) { throw Slic3r::SlicingErrors(errors); }
std::sort(ordering.begin(), ordering.end(), [](const OrderingItem& oi1, const OrderingItem& oi2) { return oi1.print_z < oi2.print_z; });