ajandClaude Opus 5.5
1b5e1b14a6
Every nesting-geometry consumer filtered only rapids, so scribe/etch moves counted as part material. An etch tick that ends a hair outside the outline (PEP bend ticks start on the notch edge) made the part "open geometry leaving the material region": the job validator threw and every built-in engine plus Gpt6Astra crashed on real PEP jobs (PT75, drawing 4980 A01 PT77). Marks are only on the surface, so they should never affect placement, collision, area, or validation. - SpecialLayers.IsMaterial excludes Rapid and Scribe; used by drawing area, canonical angle, part collision, PartGeometry, plate perimeter, best-fit/pair evaluation, rotation analysis, GPU evaluators, and both validators. Timing, display, splitting and posts still see marks. - ConvertGeometry also maps the saved SCRIBE layer name to Scribe, so programs rebuilt from stored entities keep their marks. - NestReader repairs older files (e.g. PepNestExport output) whose programs saved etch as cut moves while source entities kept SCRIBE. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
80 lines
2.5 KiB
C#
80 lines
2.5 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using OpenNest.CNC;
|
|
using OpenNest.Converters;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Tests.Converters;
|
|
|
|
public class ScribeLayerRepairTests
|
|
{
|
|
// Mirrors a PEP-exported drawing: incremental program whose first rapid was moved to the
|
|
// origin (Source.Offset), with an etch tick saved as a plain cut move.
|
|
private static readonly Vector Offset = new(5, 2);
|
|
|
|
private static Program RectangleWithCutEtch()
|
|
{
|
|
var program = new Program(Mode.Incremental);
|
|
program.Codes.Add(new RapidMove(0, 0));
|
|
program.Codes.Add(new LinearMove(1, 0)); // etch tick, source (5,2)->(6,2)
|
|
program.Codes.Add(new RapidMove(-5, -2));
|
|
program.Codes.Add(new LinearMove(10, 0));
|
|
program.Codes.Add(new LinearMove(0, 10));
|
|
program.Codes.Add(new LinearMove(-10, 0));
|
|
program.Codes.Add(new LinearMove(0, -10));
|
|
return program;
|
|
}
|
|
|
|
private static List<Entity> SourceEntities() =>
|
|
new()
|
|
{
|
|
new Line(5, 2, 6, 2) { Layer = SpecialLayers.Scribe },
|
|
new Line(0, 0, 10, 0),
|
|
new Line(10, 0, 10, 10),
|
|
new Line(10, 10, 0, 10),
|
|
new Line(0, 10, 0, 0),
|
|
};
|
|
|
|
[Fact]
|
|
public void RestoresScribeOnMovesThatLieOnMarkEntities()
|
|
{
|
|
var program = RectangleWithCutEtch();
|
|
|
|
var repaired = ScribeLayerRepair.Apply(program, SourceEntities(), Offset);
|
|
|
|
var lines = program.Codes.OfType<LinearMove>().ToList();
|
|
Assert.Equal(1, repaired);
|
|
Assert.Equal(LayerType.Scribe, lines[0].Layer);
|
|
Assert.All(lines.Skip(1), m => Assert.Equal(LayerType.Cut, m.Layer));
|
|
}
|
|
|
|
[Fact]
|
|
public void RecognizesRawEtchLayerNames()
|
|
{
|
|
var program = RectangleWithCutEtch();
|
|
var entities = SourceEntities();
|
|
entities[0].Layer = new Layer("etch");
|
|
|
|
Assert.Equal(1, ScribeLayerRepair.Apply(program, entities, Offset));
|
|
}
|
|
|
|
[Fact]
|
|
public void LeavesProgramAloneWithoutMarkEntities()
|
|
{
|
|
var program = RectangleWithCutEtch();
|
|
|
|
var repaired = ScribeLayerRepair.Apply(program, SourceEntities().Skip(1), Offset);
|
|
|
|
Assert.Equal(0, repaired);
|
|
Assert.All(program.Codes.OfType<LinearMove>(), m => Assert.Equal(LayerType.Cut, m.Layer));
|
|
}
|
|
|
|
[Fact]
|
|
public void WrongOffsetMatchesNothing()
|
|
{
|
|
var program = RectangleWithCutEtch();
|
|
|
|
Assert.Equal(0, ScribeLayerRepair.Apply(program, SourceEntities(), new Vector(0, 0)));
|
|
}
|
|
}
|