fix: improve arc-tangency fitting and add layered engrave/cut passes for GravographIS
GeometrySimplifier/ArcFit now fit arcs that pass exactly through run endpoints while balancing tangency error between trusted and estimated directions, fixing arcs that previously bulged or broke tangent continuity at fillet/compound-curve junctions. GravographIS post processor gains per-layer (engrave/cut) tool passes via a new GravographISPostConfig, so ENGRAVE/ETCH-tagged geometry runs as a separate scribe pass with its own feed/depth and an operator pause before the cut pass (spring-floated spindle needs a tool swap). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.6
@@ -0,0 +1,51 @@
|
||||
using OpenNest.CNC;
|
||||
using OpenNest.Posts.GravographIS;
|
||||
|
||||
namespace OpenNest.Tests.GravographIS;
|
||||
|
||||
public class GravographISPostConfigTests
|
||||
{
|
||||
[Fact]
|
||||
public void Defaults_EngraveBlock_NoPause_FasterFeed()
|
||||
{
|
||||
var config = new GravographISPostConfig();
|
||||
|
||||
Assert.Equal(10, config.Engrave.FeedMmPerSec);
|
||||
Assert.False(config.Engrave.PauseBefore);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Defaults_CutBlock_PausesToChangeTool()
|
||||
{
|
||||
var config = new GravographISPostConfig();
|
||||
|
||||
Assert.Equal(3, config.Cut.FeedMmPerSec);
|
||||
Assert.True(config.Cut.PauseBefore);
|
||||
Assert.Equal("Change tool", config.Cut.PauseMessage);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(LayerType.Scribe)]
|
||||
public void ConfigFor_Scribe_ReturnsEngraveBlock(LayerType layer)
|
||||
{
|
||||
var config = new GravographISPostConfig();
|
||||
Assert.Same(config.Engrave, config.ConfigFor(layer));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(LayerType.Cut)]
|
||||
[InlineData(LayerType.Leadin)]
|
||||
[InlineData(LayerType.Leadout)]
|
||||
public void ConfigFor_CutLayers_ReturnCutBlock(LayerType layer)
|
||||
{
|
||||
var config = new GravographISPostConfig();
|
||||
Assert.Same(config.Cut, config.ConfigFor(layer));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConfigFor_Display_ReturnsNull_SoItIsSkipped()
|
||||
{
|
||||
var config = new GravographISPostConfig();
|
||||
Assert.Null(config.ConfigFor(LayerType.Display));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
using System.Collections.Generic;
|
||||
using OpenNest.CNC;
|
||||
using OpenNest.Geometry;
|
||||
using OpenNest.Posts.GravographIS;
|
||||
|
||||
namespace OpenNest.Tests.GravographIS;
|
||||
|
||||
public class GravographISPostProcessorTests
|
||||
{
|
||||
private static LayeredPolyline Poly(LayerType layer, params Vector[] pts)
|
||||
=> new LayeredPolyline(new List<Vector>(pts), layer);
|
||||
|
||||
[Fact]
|
||||
public void BuildPasses_EngraveAndCut_OrdersEngraveFirstThenCutWithPause()
|
||||
{
|
||||
var post = new GravographISPostProcessor();
|
||||
|
||||
var passes = post.BuildPasses(new[]
|
||||
{
|
||||
Poly(LayerType.Cut, new Vector(0, 0), new Vector(1, 0)),
|
||||
Poly(LayerType.Scribe, new Vector(0, 0), new Vector(0, 1)),
|
||||
});
|
||||
|
||||
Assert.Equal(2, passes.Count);
|
||||
|
||||
Assert.Equal(post.Config.Engrave.FeedMmPerSec, passes[0].FeedMmPerSec);
|
||||
Assert.False(passes[0].PauseBefore);
|
||||
|
||||
Assert.Equal(post.Config.Cut.FeedMmPerSec, passes[1].FeedMmPerSec);
|
||||
Assert.True(passes[1].PauseBefore);
|
||||
Assert.Equal("Change tool", passes[1].PauseMessage);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildPasses_CutOnly_IsSinglePass()
|
||||
{
|
||||
var post = new GravographISPostProcessor();
|
||||
|
||||
var passes = post.BuildPasses(new[]
|
||||
{
|
||||
Poly(LayerType.Cut, new Vector(0, 0), new Vector(1, 0)),
|
||||
});
|
||||
|
||||
Assert.Single(passes);
|
||||
Assert.Equal(post.Config.Cut.FeedMmPerSec, passes[0].FeedMmPerSec);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildPasses_SkipsDisplayGeometry()
|
||||
{
|
||||
var post = new GravographISPostProcessor();
|
||||
|
||||
var passes = post.BuildPasses(new[]
|
||||
{
|
||||
Poly(LayerType.Display, new Vector(0, 0), new Vector(1, 0)),
|
||||
Poly(LayerType.Cut, new Vector(0, 0), new Vector(0, 1)),
|
||||
});
|
||||
|
||||
Assert.Single(passes);
|
||||
Assert.Equal(post.Config.Cut.FeedMmPerSec, passes[0].FeedMmPerSec);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Config_IsExposedThroughConfigurableInterface()
|
||||
{
|
||||
var post = new GravographISPostProcessor(new GravographISPostConfig());
|
||||
OpenNest.IConfigurablePostProcessor configurable = post;
|
||||
Assert.Same(post.Config, configurable.Config);
|
||||
}
|
||||
}
|
||||
@@ -178,6 +178,101 @@ public class GravographISWriterTests
|
||||
Assert.Equal(-GravographISWriter.StepsPerInch, dy);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Passes_PauseBeforeCut_EmitsPauseSequenceBetweenGroups()
|
||||
{
|
||||
var engrave = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(1, 0) } };
|
||||
var cut = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(0, -1) } };
|
||||
var passes = new List<GravographPass>
|
||||
{
|
||||
new GravographPass { Polylines = engrave, FeedMmPerSec = 10, DepthInches = 0.25 },
|
||||
new GravographPass { Polylines = cut, FeedMmPerSec = 3, DepthInches = 0.25, PauseBefore = true, PauseMessage = "Hi" },
|
||||
};
|
||||
|
||||
using var ms = new MemoryStream();
|
||||
new GravographISWriter(new GravographISWriterOptions
|
||||
{
|
||||
EnvelopeGuardEnabled = false,
|
||||
ReturnToOriginAtEnd = false,
|
||||
}).Write(passes, ms);
|
||||
var bytes = ms.ToArray();
|
||||
|
||||
var mcOff = IndexOf(bytes, 0, (byte)'M', (byte)'C', 0x00, 0x00);
|
||||
var ouFb = IndexOf(bytes, mcOff, (byte)'O', (byte)'U', 0xFF, 0xFB);
|
||||
var ouFa = IndexOf(bytes, ouFb, (byte)'O', (byte)'U', 0xFF, 0xFA);
|
||||
var lbBegin = IndexOf(bytes, ouFa, (byte)'L', (byte)'B', 0x00, 0x00);
|
||||
var lbMsg = IndexOf(bytes, lbBegin, (byte)'L', (byte)'B', (byte)'H', (byte)'i');
|
||||
var nr = IndexOf(bytes, lbMsg, (byte)'N', (byte)'R', 0x00, 0x01);
|
||||
var lbEnd = IndexOf(bytes, nr, (byte)'L', (byte)'B', 0x00, 0x01);
|
||||
var mcOn = IndexOf(bytes, lbEnd, (byte)'M', (byte)'C', 0x00, 0x01);
|
||||
|
||||
Assert.True(mcOff >= 0, "motor-off (MC 0000) not found");
|
||||
Assert.True(mcOff < ouFb && ouFb < ouFa && ouFa < lbBegin && lbBegin < lbMsg
|
||||
&& lbMsg < nr && nr < lbEnd && lbEnd < mcOn,
|
||||
"pause commands out of order");
|
||||
|
||||
// Resume sets the cut feed inline (VS 0x0003) after the motor restarts.
|
||||
var vsCut = IndexOf(bytes, mcOn, (byte)'V', (byte)'S', 0x00, 0x03);
|
||||
Assert.True(vsCut > mcOn, "cut feed not set after resume");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Passes_PauseOddMessage_SpacePadsLastPacket()
|
||||
{
|
||||
var passes = new List<GravographPass>
|
||||
{
|
||||
new GravographPass { Polylines = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(1, 0) } }, FeedMmPerSec = 10 },
|
||||
new GravographPass { Polylines = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(0, -1) } }, FeedMmPerSec = 3, PauseBefore = true, PauseMessage = "abc" },
|
||||
};
|
||||
|
||||
using var ms = new MemoryStream();
|
||||
new GravographISWriter(new GravographISWriterOptions { EnvelopeGuardEnabled = false, ReturnToOriginAtEnd = false }).Write(passes, ms);
|
||||
var bytes = ms.ToArray();
|
||||
|
||||
var lbAb = IndexOf(bytes, 0, (byte)'L', (byte)'B', (byte)'a', (byte)'b');
|
||||
var lbCPad = IndexOf(bytes, lbAb, (byte)'L', (byte)'B', (byte)'c', 0x20);
|
||||
Assert.True(lbAb >= 0, "first message packet 'ab' not found");
|
||||
Assert.True(lbCPad > lbAb, "odd packet not space-padded to 'c '");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Passes_DifferentFeeds_NoPause_EmitsInlineFeedChangeNoMessage()
|
||||
{
|
||||
var passes = new List<GravographPass>
|
||||
{
|
||||
new GravographPass { Polylines = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(1, 0) } }, FeedMmPerSec = 10 },
|
||||
new GravographPass { Polylines = new List<IReadOnlyList<Vector>> { new[] { new Vector(0, 0), new Vector(0, -1) } }, FeedMmPerSec = 3, PauseBefore = false },
|
||||
};
|
||||
|
||||
using var ms = new MemoryStream();
|
||||
new GravographISWriter(new GravographISWriterOptions { EnvelopeGuardEnabled = false, ReturnToOriginAtEnd = false }).Write(passes, ms);
|
||||
var bytes = ms.ToArray();
|
||||
|
||||
Assert.True(IndexOf(bytes, 0, (byte)'V', (byte)'S', 0x00, 0x03) >= 0, "inline cut feed change missing");
|
||||
Assert.True(IndexOfCmd(bytes, (byte)'L', (byte)'B') < 0, "no LB message expected without a pause");
|
||||
}
|
||||
|
||||
private static int IndexOf(byte[] bytes, int from, byte c0, byte c1, byte hi, byte lo)
|
||||
{
|
||||
for (var i = System.Math.Max(0, from); i <= bytes.Length - 6; i++)
|
||||
{
|
||||
if (bytes[i] == 0xFF && bytes[i + 1] == 0xFD && bytes[i + 2] == c0 &&
|
||||
bytes[i + 3] == c1 && bytes[i + 4] == hi && bytes[i + 5] == lo)
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private static int IndexOfCmd(byte[] bytes, byte c0, byte c1)
|
||||
{
|
||||
for (var i = 0; i <= bytes.Length - 4; i++)
|
||||
{
|
||||
if (bytes[i] == 0xFF && bytes[i + 1] == 0xFD && bytes[i + 2] == c0 && bytes[i + 3] == c1)
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private static void AssertOperand(byte[] bytes, byte c0, byte c1, byte hi, byte lo)
|
||||
{
|
||||
for (var i = 0; i < bytes.Length - 5; i++)
|
||||
|
||||
@@ -34,4 +34,45 @@ public class NestPolylineExtractorTests
|
||||
Assert.Equal(new Vector(0.25, 47.75), poly[3]);
|
||||
Assert.Equal(new Vector(0.25, 46.75), poly[4]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ExtractPartLayered_SplitsContinuousChainAtLayerChange()
|
||||
{
|
||||
// A single continuous chain (no rapid) that switches from Scribe to Cut
|
||||
// must be split into two layer-uniform polylines sharing the seam vertex,
|
||||
// so the post can emit a tool-change pause between engrave and cut.
|
||||
var program = new Program(Mode.Absolute);
|
||||
program.Codes.Add(new LinearMove(1, 0) { Layer = LayerType.Scribe });
|
||||
program.Codes.Add(new LinearMove(2, 0) { Layer = LayerType.Scribe });
|
||||
program.Codes.Add(new LinearMove(2, 1) { Layer = LayerType.Cut });
|
||||
program.Codes.Add(new LinearMove(3, 1) { Layer = LayerType.Cut });
|
||||
|
||||
var drawing = new Drawing("Mixed", program);
|
||||
var part = new Part(drawing, new Vector(0, 0));
|
||||
|
||||
var polylines = new NestPolylineExtractor().ExtractPartLayered(part);
|
||||
|
||||
Assert.Equal(2, polylines.Count);
|
||||
|
||||
Assert.Equal(LayerType.Scribe, polylines[0].Layer);
|
||||
Assert.Equal(new[] { new Vector(0, 0), new Vector(1, 0), new Vector(2, 0) }, polylines[0].Points);
|
||||
|
||||
Assert.Equal(LayerType.Cut, polylines[1].Layer);
|
||||
Assert.Equal(new[] { new Vector(2, 0), new Vector(2, 1), new Vector(3, 1) }, polylines[1].Points);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ExtractPartLayered_UniformChain_IsSinglePolyline()
|
||||
{
|
||||
var program = new Program(Mode.Absolute);
|
||||
program.Codes.Add(new LinearMove(1, 0));
|
||||
program.Codes.Add(new LinearMove(1, 1));
|
||||
|
||||
var part = new Part(new Drawing("Cut", program), new Vector(0, 0));
|
||||
|
||||
var polylines = new NestPolylineExtractor().ExtractPartLayered(part);
|
||||
|
||||
Assert.Single(polylines);
|
||||
Assert.Equal(LayerType.Cut, polylines[0].Layer);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user