3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: seam enforcers not always respected (#5137, #5294)

Browse Source
This commit is contained in:
Lukas Matena 2020-12-04 14:19:41 +01:00
parent 91cc119146
commit 98434eb77b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ Point SeamPlacer::get_seam(const Layer& layer, const SeamPosition seam_position,
float penalty_aligned = penalties[last_pos_proj_idx]; float penalty_aligned = penalties[last_pos_proj_idx];
float penalty_min = penalties[idx_min]; float penalty_min = penalties[idx_min];
float penalty_diff_abs = std::abs(penalty_min - penalty_aligned); float penalty_diff_abs = std::abs(penalty_min - penalty_aligned);
float penalty_max = std::max(penalty_min, penalty_aligned); float penalty_max = std::max(std::abs(penalty_min), std::abs(penalty_aligned));
float penalty_diff_rel = (penalty_max == 0.f) ? 0.f : penalty_diff_abs / penalty_max; float penalty_diff_rel = (penalty_max == 0.f) ? 0.f : penalty_diff_abs / penalty_max;
// printf("Align seams, penalty aligned: %f, min: %f, diff abs: %f, diff rel: %f\n", penalty_aligned, penalty_min, penalty_diff_abs, penalty_diff_rel); // printf("Align seams, penalty aligned: %f, min: %f, diff abs: %f, diff rel: %f\n", penalty_aligned, penalty_min, penalty_diff_abs, penalty_diff_rel);
if (std::abs(penalty_diff_rel) < 0.05) { if (std::abs(penalty_diff_rel) < 0.05) {
@ -697,12 +697,14 @@ void SeamPlacer::apply_custom_seam(const Polygon& polygon, size_t po_idx,
//////////////////////// ////////////////////////
// std::ostringstream os; // std::ostringstream os;
// os << std::setw(3) << std::setfill('0') << layer_id; // os << std::setw(3) << std::setfill('0') << layer_id;
// int a = scale_(20.); // int a = scale_(30.);
// SVG svg("custom_seam" + os.str() + ".svg", BoundingBox(Point(-a, -a), Point(a, a))); // SVG svg("custom_seam" + os.str() + ".svg", BoundingBox(Point(-a, -a), Point(a, a)));
// /*if (! m_enforcers.empty()) // //if (! m_enforcers[po_idx].empty())
// svg.draw(m_enforcers[layer_id], "blue"); // // svg.draw(m_enforcers[po_idx][layer_id].polys, "blue");
// if (! m_blockers.empty()) // //if (! m_blockers[po_idx].empty())
// svg.draw(m_blockers[layer_id], "red");*/ // // svg.draw(m_blockers[po_idx][layer_id].polys, "red");
// size_t min_idx = std::min_element(penalties.begin(), penalties.end()) - penalties.begin(); // size_t min_idx = std::min_element(penalties.begin(), penalties.end()) - penalties.begin();
@ -713,13 +715,8 @@ void SeamPlacer::apply_custom_seam(const Polygon& polygon, size_t po_idx,
// if (min_idx == i) { // if (min_idx == i) {
// fill = "yellow"; // fill = "yellow";
// size = 5e5; // size = 5e5;
// } else { // } else
// fill = (std::find(enforcers_idxs.begin(), enforcers_idxs.end(), i) != enforcers_idxs.end() ? "green" : "black"); // fill = (std::find(enforcers_idxs.begin(), enforcers_idxs.end(), i) != enforcers_idxs.end() ? "green" : "black");
// if (std::find(enf_centers.begin(), enf_centers.end(), i) != enf_centers.end()) {
// size = 5e5;
// fill = "blue";
// }
// }
// if (i != 0) // if (i != 0)
// svg.draw(polygon.points[i], fill, size); // svg.draw(polygon.points[i], fill, size);
// else // else