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

Fix #12916: Seams now respect per object settings

Browse Source
This commit is contained in:
Martin Šach 2024-07-08 17:46:15 +02:00 committed by Lukas Matena
parent 3c3591f8a0
commit fb47a62fd7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/GCode/SeamPlacer.cpp
View File

@ -70,7 +70,7 @@ ObjectSeams precalculate_seams(
ObjectSeams result; ObjectSeams result;
for (auto &[print_object, layer_perimeters] : seam_data) { for (auto &[print_object, layer_perimeters] : seam_data) {
switch (params.seam_preference) { switch (print_object->config().seam_position.value) {
case spAligned: { case spAligned: {
const Transform3d transformation{print_object->trafo_centered()}; const Transform3d transformation{print_object->trafo_centered()};
const ModelVolumePtrs &volumes{print_object->model_object()->volumes}; const ModelVolumePtrs &volumes{print_object->model_object()->volumes};
@ -97,7 +97,8 @@ ObjectSeams precalculate_seams(
break; break;
} }
case spNearest: { case spNearest: {
throw std::runtime_error("Cannot precalculate seams for nearest position!"); // Do not precalculate anything.
break;
} }
} }
throw_if_canceled(); throw_if_canceled();
@ -122,7 +123,6 @@ Params Placer::get_params(const DynamicPrintConfig &config) {
params.perimeter.convex_threshold = Slic3r::Geometry::deg2rad(10.0); params.perimeter.convex_threshold = Slic3r::Geometry::deg2rad(10.0);
params.perimeter.concave_threshold = Slic3r::Geometry::deg2rad(15.0); params.perimeter.concave_threshold = Slic3r::Geometry::deg2rad(15.0);
params.seam_preference = config.opt_enum<SeamPosition>("seam_position");
params.staggered_inner_seams = config.opt_bool("staggered_inner_seams"); params.staggered_inner_seams = config.opt_bool("staggered_inner_seams");
params.max_nearest_detour = 1.0; params.max_nearest_detour = 1.0;
@ -159,15 +159,19 @@ void Placer::init(
} }
ObjectLayerPerimeters perimeters{get_perimeters(objects, params, object_painting, throw_if_canceled)}; ObjectLayerPerimeters perimeters{get_perimeters(objects, params, object_painting, throw_if_canceled)};
this->params = params; ObjectLayerPerimeters perimeters_for_precalculation;
if (this->params.seam_preference != spNearest) { for (auto &[print_object, layer_perimeters] : perimeters) {
this->seams_per_object = if (print_object->config().seam_position.value == spNearest) {
precalculate_seams(params, std::move(perimeters), throw_if_canceled); this->perimeters_per_layer[print_object] = std::move(layer_perimeters);
} else { } else {
this->perimeters_per_layer = std::move(perimeters); perimeters_for_precalculation[print_object] = std::move(layer_perimeters);
}
} }
this->params = params;
this->seams_per_object = precalculate_seams(params, std::move(perimeters_for_precalculation), throw_if_canceled);
BOOST_LOG_TRIVIAL(debug) << "SeamPlacer: init: end"; BOOST_LOG_TRIVIAL(debug) << "SeamPlacer: init: end";
} }
@ -360,7 +364,7 @@ Point Placer::place_seam(const Layer *layer, const ExtrusionLoop &loop, const Po
const double loop_width{loop.paths.empty() ? 0.0 : loop.paths.front().width()}; const double loop_width{loop.paths.empty() ? 0.0 : loop.paths.front().width()};
if (this->params.seam_preference == spNearest) { if (po->config().seam_position.value == spNearest) {
const std::vector<Perimeters::BoundedPerimeter> &perimeters{this->perimeters_per_layer.at(po)[layer_index]}; const std::vector<Perimeters::BoundedPerimeter> &perimeters{this->perimeters_per_layer.at(po)[layer_index]};
const auto [seam_choice, perimeter_index] = place_seam_near(perimeters, loop, last_pos, this->params.max_nearest_detour); const auto [seam_choice, perimeter_index] = place_seam_near(perimeters, loop, last_pos, this->params.max_nearest_detour);
return finalize_seam_position(loop_polygon, seam_choice, perimeters[perimeter_index].perimeter, loop_width, do_staggering); return finalize_seam_position(loop_polygon, seam_choice, perimeters[perimeter_index].perimeter, loop_width, do_staggering);

1
src/libslic3r/GCode/SeamPlacer.hpp
View File

@ -37,7 +37,6 @@ struct Params
double concave_visibility_modifier{}; double concave_visibility_modifier{};
Perimeters::PerimeterParams perimeter; Perimeters::PerimeterParams perimeter;
Slic3r::ModelInfo::Visibility::Params visibility; Slic3r::ModelInfo::Visibility::Params visibility;
SeamPosition seam_preference;
bool staggered_inner_seams; bool staggered_inner_seams;
}; };