fix: show both offset and rotation in SubProgramCall.ToString

The either/or format meant a SubProgramCall with both a non-zero
Offset and non-zero Rotation would only show the Offset, hiding the
rotation metadata. The data model supports both independently, so the
display should too.

Also fixes a zero-field leak where the old fallback emitted
`G65 P_ R0` for calls with no rotation. Now each field is only shown
when non-zero, and `G65 P_` with no arguments is emitted when
neither is set.

Note: SubProgramCall.ToString is purely a debug/display aid. The
Cincinnati post emits sub-calls via the G52 + M98 bracket, not via
G65, so this format doesn't correspond to real machine output.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-10 08:37:46 -04:00
parent e63be93051
commit 24babe353e
2 changed files with 27 additions and 3 deletions

View File

@@ -44,6 +44,25 @@ public class HoleSubProgramTests
Assert.Contains("Y2.5", str);
}
[Fact]
public void SubProgramCall_ToString_IncludesOffsetAndRotation()
{
var call = new SubProgramCall { Id = 1000, Offset = new Vector(1.5, 2.5), Rotation = 30 };
var str = call.ToString();
Assert.Contains("P1000", str);
Assert.Contains("X1.5", str);
Assert.Contains("Y2.5", str);
Assert.Contains("R30", str);
}
[Fact]
public void SubProgramCall_ToString_OmitsZeroFields()
{
var call = new SubProgramCall { Id = 1000 };
var str = call.ToString();
Assert.Equal("G65 P1000", str);
}
[Fact]
public void Program_SubPrograms_EmptyByDefault()
{