Skip to content

[CURA-13287] Re-fix random dots without introducing microsegments. #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Remco Burema (rburema) wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[CURA-13287] Re-fix random dots without introducing microsegments. #2357

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06cf42c
Re-fix random dots without introducing microsegments.
rburema Aug 5, 2026
b38dc4d
Apply clang-format
rburema Aug 5, 2026
bb861bc
Don't add 'empty' (combined local maxima) points.
rburema Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions src/arachne/SkeletalTrapezoidation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2212,11 +2212,22 @@ void SkeletalTrapezoidation::generateLocalMaximaSingleBeads()
Point2LL p_;
coord_t width_;
size_t acc_;

@wawanbreton Erwan MATHIEU (wawanbreton) Aug 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is not part of this PR, but could this variable be renamed with a more explicit name ? Out of the context, I don't know if this is acceleration, accumulation or something else 😄

coord_t length_;

// NOTE: Empty constructor; `acc_` is set to 0, so that it can be used as a neutral element in the `+=` operator.
LocalMaximaPoint()
: p_(0, 0)
, width_(0)
, acc_(0)
, length_(0)
{
}

LocalMaximaPoint(const Point2LL& p, coord_t width)
: p_(p)
, width_(width)
, acc_(1)
, length_(0)
{
}

Expand All @@ -2225,19 +2236,20 @@ void SkeletalTrapezoidation::generateLocalMaximaSingleBeads()
p_ = (p_ * acc_ + other.p_ * other.acc_) / (acc_ + other.acc_);
width_ = (width_ * acc_ + other.width_ * other.acc_) / (acc_ + other.acc_);
acc_ += other.acc_;
length_ += other.length_ + (acc_ >= 1 && other.acc_ >= 1) ? vSize(p_ - other.p_) : 0L;
}
};

std::vector<LocalMaximaPoint> local_maxima_points;
LocalMaximaPoint combined_local_maxima_point;

for (const auto& node : graph_.nodes_)
{
if (! node.data_.hasBeading())
if (! (node.data_.hasBeading() && node.isLocalMaximum(true)))
{
continue;
}
const Beading& beading = node.data_.getBeading()->beading_;
if (beading.bead_widths.size() % 2 == 1 && node.isLocalMaximum(true))
if (beading.bead_widths.size() % 2 == 1)
{
const size_t inset_index = beading.bead_widths.size() / 2;
const coord_t width = beading.bead_widths[inset_index];
Expand All @@ -2247,28 +2259,14 @@ void SkeletalTrapezoidation::generateLocalMaximaSingleBeads()
}
else
{
const auto it = ranges::find_if(
local_maxima_points,
[&](const LocalMaximaPoint& local_maxima_point)
{
return vSize2(local_maxima_point.p_ - node.p_) < 10 * 10;
});

if (it != local_maxima_points.end())
{
*it += (LocalMaximaPoint(node.p_, width));
}
else
{
local_maxima_points.emplace_back(node.p_, width);
}
combined_local_maxima_point += LocalMaximaPoint(node.p_, width);
}
}
}

for (const auto& local_maxima_point : local_maxima_points)
if (combined_local_maxima_point.acc_ > 0 && combined_local_maxima_point.length_ < (combined_local_maxima_point.width_ * 2L))
{
addCircleToToolpath(local_maxima_point.p_, local_maxima_point.width_, 0);
addCircleToToolpath(combined_local_maxima_point.p_, combined_local_maxima_point.width_, 0);
}
}
//
Expand Down
Loading