aj/OpenNest
1
0 Fork 0
mirror of https://github.com/ajisaacs/OpenNest.git synced 2026-10-27 00:21:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert: drop the duplicate near-vertex hole-cut fix

Browse Source 
Master already starts such entries exactly at the vertex (45592a81), so the
cherry-picked snap was redundant and its test's off-vertex precondition no
longer holds.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ajandClaude Opus 5.5 committed 2026-10-24 21:24:57 -04:00
1 parent f600c5e58b
commit ba55d5bff0
2 files changed
-67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

OpenNest.Core/CNC/CuttingStrategy/ContourCuttingStrategy.cs
-17
View File
@@ -433,22 +433,6 @@ namespace OpenNest.CNC.CuttingStrategy
private static bool SameVector(Vector a, Vector b) => SameBits(a.X, b.X) && SameBits(a.Y, b.Y);
private static bool SameBits(double a, double b) => BitConverter.DoubleToInt64Bits(a) == BitConverter.DoubleToInt64Bits(b);
// ReindexAt starts the contour at the vertex when the entry is within Tolerance.Epsilon of it
// (Line/Arc.SplitAt keep the entity whole), so the lead-in must end there too; otherwise the
// cut closes at the vertex, short of the entry by that sliver.
private static Vector SnapToSplitVertex(Vector point, Entity entity)
{
var (start, end) = entity switch
{
Line line => (line.StartPoint, line.EndPoint),
Arc arc => (arc.StartPoint(), arc.EndPoint()),
_ => (point, point),
};
if (point.DistanceTo(start) < Tolerance.Epsilon)
return start;
return point.DistanceTo(end) < Tolerance.Epsilon ? end : point;
}
private void EmitContour(
Program program,
Shape shape,
@@ -459,7 +443,6 @@ namespace OpenNest.CNC.CuttingStrategy
Vector? scrapPierce = null
)
{
point = SnapToSplitVertex(point, entity);
var contourType = forceType ?? DetectContourType(shape);
var winding = DetermineWinding(shape);
var normal = ComputeNormal(point, entity, contourType, winding);
OpenNest.Tests/CuttingPlanning/NearVertexEntryTests.cs
-50
View File
@@ -1,50 +0,0 @@
using OpenNest.CNC;
using OpenNest.CNC.CuttingPlanning;
using OpenNest.Geometry;
namespace OpenNest.Tests.CuttingPlanning;
/// <summary>
/// A closest-point entry can land a hair off an entity's vertex. Emission starts the contour
/// at that vertex (the split keeps the entity whole), so the lead-in must end there too, or
/// the cut closes short of where it started and replay refuses the whole plate.
/// </summary>
public class NearVertexEntryTests
{
private static readonly Vector Center = new(5, 5);
private const double Radius = 0.3125;
// A hole drawn as two half arcs meeting at its top and bottom, inside a square perimeter.
private static Program HalfArcHole()
{
var p = ExplicitContourTests.Square(false);
p.MoveTo(Center.X, Center.Y + Radius);
p.ArcTo(Center.X, Center.Y - Radius, Center.X, Center.Y, RotationType.CCW);
p.ArcTo(Center.X, Center.Y + Radius, Center.X, Center.Y, RotationType.CCW);
return p;
}
[Theory]
[InlineData(4.1e-6)] // just before the top vertex, at the end of the second arc
[InlineData(-4.1e-6)] // just after it, at the start of the first arc
public void HoleCutClosesWhereItsLeadInEnds(double angleFromTop)
{
var prepared = PreparedContours.Capture(HalfArcHole(), ExplicitContourTests.Parameters());
var hole = Enumerable.Range(0, prepared.Count).Single(c => c != prepared.PerimeterOrdinal);
var approach = Center + new Vector(System.Math.Sin(angleFromTop), System.Math.Cos(angleFromTop)) * 10;
var entry = prepared.ClosestEntry(hole, approach);
var top = new Vector(Center.X, Center.Y + Radius);
Assert.InRange(entry.Point.DistanceTo(top), 1e-6, 1e-5);
var program = prepared.Emit(new[] { entry, prepared.ClosestEntry(prepared.PerimeterOrdinal, new Vector(0, 0)) });
program.Mode = Mode.Absolute;
var holeMotions = program.Codes.OfType<Motion>().SkipWhile(m => m is RapidMove)
.TakeWhile(m => m is not RapidMove).ToArray();
// Line lead-in, then the two half arcs back to the lead-in's end.
Assert.Equal(3, holeMotions.Length);
Assert.True(holeMotions[^1].EndPoint.DistanceTo(holeMotions[0].EndPoint) <= 1e-9,
$"cut ends {holeMotions[^1].EndPoint.DistanceTo(holeMotions[0].EndPoint)} from its start");
Assert.True(holeMotions[0].EndPoint.DistanceTo(top) <= 1e-9);
}
}