GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-13 12:09:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass non-rectangular beds, add undo/redo snapshot

Browse Source
This commit is contained in:
Lukas Matena 2025-02-06 14:49:37 +01:00
parent da9be3c9e8
commit 531f00e6b9
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libseqarrange/src/seq_sequential.cpp
View File

@ -9616,7 +9616,7 @@ bool optimize_ConsequentialWeakPolygonNonoverlappingBinaryCentered(z3::solver
const ProgressRange &progress_range,
std::function<void(int)> progress_callback)
{
assert(polygon.is_counter_clockwise());
assert(solver_configuration.plate_bounding_polygon.is_counter_clockwise());
assert(solver_configuration.plate_bounding_polygon.points.size() > 0);
z3::set_param("timeout", solver_configuration.optimization_timeout.c_str());

46
src/libslic3r/ArrangeHelper.cpp
View File

@ -4,6 +4,7 @@
#include "libslic3r/TriangleMesh.hpp"
#include "libslic3r/MultipleBeds.hpp"
#include "libslic3r/PresetBundle.hpp"
#include "libslic3r/BuildVolume.hpp"
#include <string>
@ -29,11 +30,20 @@ static Sequential::PrinterGeometry get_printer_geometry(const ConfigBase& config
std::vector<Polygon> polygons;
};
BuildVolume bv(config.opt<ConfigOptionPoints>("bed_shape")->values, 10.);
const BoundingBox& bb = bv.bounding_box();
Polygon bed_polygon;
if (bv.type() == BuildVolume::Type::Circle) {
// Generate an inscribed octagon.
double r = bv.bounding_volume2d().size().x() / 2.;
for (double a = 2*M_PI; a > 0.1; a -= M_PI/4.)
bed_polygon.points.emplace_back(Point::new_scale(r * std::sin(a), r * std::cos(a)));
} else {
// Rectangle of Custom. Just use the bounding box.
bed_polygon = bb.polygon();
}
double bed_x = s_multiple_beds.get_bed_size().x();
double bed_y = s_multiple_beds.get_bed_size().y();
std::vector<ExtruderSlice> slices;
const std::string printer_notes = config.opt_string("printer_notes");
{
if (! printer_notes.empty()) {
@ -80,35 +90,19 @@ static Sequential::PrinterGeometry get_printer_geometry(const ConfigBase& config
}
if (slices.empty()) {
// Fallback to primitive model using radius and height.
coord_t r = scaled(std::max(0., config.opt_float("extruder_clearance_radius")));
coord_t r = scaled(std::max(0.1, config.opt_float("extruder_clearance_radius")));
coord_t h = scaled(std::max(0.1, config.opt_float("extruder_clearance_height")));
if (r > 0.001) {
slices.push_back(ExtruderSlice{ 0, CONVEX, { { { -5000000, -5000000 }, { 5000000, -5000000 }, { 5000000, 5000000 }, { -5000000, 5000000 } } } });
slices.push_back(ExtruderSlice{ 1000000, BOX, { { { -r, -r }, { r, -r }, { r, r }, { -r, r } } } });
slices.push_back(ExtruderSlice{ h, BOX, { { { -scaled(bed_x), -r }, { scaled(bed_x), -r }, { scaled(bed_x), r }, { -scaled(bed_x), r}}} });
}
double bed_x = bv.bounding_volume2d().size().x();
double bed_y = bv.bounding_volume2d().size().y();
slices.push_back(ExtruderSlice{ 0, CONVEX, { { { -5000000, -5000000 }, { 5000000, -5000000 }, { 5000000, 5000000 }, { -5000000, 5000000 } } } });
slices.push_back(ExtruderSlice{ 1000000, BOX, { { { -r, -r }, { r, -r }, { r, r }, { -r, r } } } });
slices.push_back(ExtruderSlice{ h, BOX, { { { -scaled(bed_x), -r }, { scaled(bed_x), -r }, { scaled(bed_x), r }, { -scaled(bed_x), r}}} });
}
}
// Convert the read data so libseqarrange understands them.
Sequential::PrinterGeometry out;
//out.plate = { { 0, 0 }, { scaled(bed_x), 0}, {scaled(bed_x), scaled(bed_y)}, {0, scaled(bed_y)}};
BoundingBox bed_bounding_box = s_multiple_beds.get_bed_box();
double min_x = bed_bounding_box.min.x();
double min_y = bed_bounding_box.min.y();
double max_x = bed_bounding_box.max.x();
double max_y = bed_bounding_box.max.y();
out.plate = { { scaled(min_x), scaled(min_y)},
{ scaled(max_x), scaled(min_y)},
// { 2 * scaled(max_x), (scaled(min_y) + scaled(max_y)) / 2}, /* for testing convex non-rectangular beds
{ scaled(max_x), scaled(max_y)},
{ scaled(min_x), scaled(max_y)}};
out.plate = bed_polygon;
for (const ExtruderSlice& slice : slices) {
(slice.shape_type == CONVEX ? out.convex_heights : out.box_heights).emplace(slice.height);
out.extruder_slices.insert(std::make_pair(slice.height, slice.polygons));

1
src/slic3r/GUI/Jobs/SeqArrangeJob.cpp
View File

@ -44,6 +44,7 @@ void SeqArrangeJob::finalize(bool canceled, std::exception_ptr&)
// If the task was cancelled, the stopping exception was already caught
// in 'process' function. Let any other exception propagate further.
if (! canceled) {
Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Arrange for sequential print"));
m_seq_arrange->apply_seq_arrange(wxGetApp().model());
wxGetApp().plater()->canvas3D()->reload_scene(true, true);
wxGetApp().obj_list()->update_after_undo_redo();