aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: add proper spacing between G-code words in Cincinnati post output

Browse Source 
G-code output was concatenated without spaces (e.g. N1005G0X1.4375Y-0.6562).
Now emits standard spacing (N1005 G0 X1.4375 Y-0.6562) across all motion
commands, line numbers, kerf comp, feedrates, M-codes, and comments.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-23 05:46:46 -04:00
parent 7e4040ba08
commit a2f7219db3
8 changed files with 334 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Tests/Cincinnati/CincinnatiFeatureWriterTests.cs
+61 -14
View File
@@ -13,9 +13,7 @@ public class CincinnatiFeatureWriterTests
UseAntiDive = true,
KerfCompensation = KerfMode.ControllerSide,
DefaultKerfSide = KerfSide.Left,
RepeatG89BeforeEachFeature = true,
ProcessParameterMode = G89Mode.LibraryFile,
DefaultLibraryFile = "MILD10",
InteriorM47 = M47Mode.Always,
ExteriorM47 = M47Mode.Always,
UseSpeedGas = false,
@@ -58,7 +56,7 @@ public class CincinnatiFeatureWriterTests
var output = WriteFeature(config, ctx);
var lines = output.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
Assert.StartsWith("N1G0X13.401Y57.4895", lines[0]);
Assert.StartsWith("N1 G0 X13.401 Y57.4895", lines[0]);
}
[Fact]
@@ -70,7 +68,7 @@ public class CincinnatiFeatureWriterTests
var output = WriteFeature(config, ctx);
var lines = output.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
Assert.StartsWith("G0X13.401Y57.4895", lines[0]);
Assert.StartsWith("G0 X13.401 Y57.4895", lines[0]);
}
[Fact]
@@ -260,8 +258,8 @@ public class CincinnatiFeatureWriterTests
var cwOutput = WriteFeature(config, SimpleContext(cwCodes));
var ccwOutput = WriteFeature(config, SimpleContext(ccwCodes));
Assert.Contains("G2X", cwOutput);
Assert.Contains("G3X", ccwOutput);
Assert.Contains("G2 X", cwOutput);
Assert.Contains("G3 X", ccwOutput);
}
[Fact]
@@ -289,12 +287,10 @@ public class CincinnatiFeatureWriterTests
}
[Fact]
public void G89_EmittedWhenRepeatEnabled()
public void G89_EmittedWithLibraryFile()
{
var config = DefaultConfig();
config.RepeatG89BeforeEachFeature = true;
config.ProcessParameterMode = G89Mode.LibraryFile;
config.DefaultLibraryFile = "MILD10";
var ctx = SimpleContext();
ctx.LibraryFile = "MILD10";
ctx.CutDistance = 18.0;
@@ -305,14 +301,65 @@ public class CincinnatiFeatureWriterTests
}
[Fact]
public void G89_NotEmittedWhenRepeatDisabled()
public void G89_WarningEmittedWhenNoLibrary()
{
var config = DefaultConfig();
config.RepeatG89BeforeEachFeature = false;
config.ProcessParameterMode = G89Mode.LibraryFile;
var ctx = SimpleContext();
ctx.LibraryFile = "";
var output = WriteFeature(config, ctx);
Assert.DoesNotContain("G89", output);
Assert.Contains("WARNING: No library found", output);
Assert.DoesNotContain("G89 P", output);
}
[Fact]
public void Etch_UsesG85InsteadOfG84()
{
var config = DefaultConfig();
var ctx = SimpleContext();
ctx.IsEtch = true;
ctx.LibraryFile = "EtchN2.lib";
var output = WriteFeature(config, ctx);
Assert.Contains("G85", output);
Assert.DoesNotContain("G84", output);
}
[Fact]
public void Etch_SkipsKerfCompensation()
{
var config = DefaultConfig();
config.KerfCompensation = KerfMode.ControllerSide;
var ctx = SimpleContext();
ctx.IsEtch = true;
ctx.LibraryFile = "EtchN2.lib";
var output = WriteFeature(config, ctx);
Assert.DoesNotContain("G41", output);
Assert.DoesNotContain("G42", output);
Assert.DoesNotContain("G40", output);
}
[Fact]
public void Etch_AllMovesUseProcessFeedrate()
{
var config = DefaultConfig();
config.KerfCompensation = KerfMode.PreApplied;
var codes = new List<ICode>
{
new RapidMove(1.0, 1.0),
new LinearMove(2.0, 1.0) { Layer = LayerType.Leadin },
new LinearMove(3.0, 1.0) { Layer = LayerType.Cut }
};
var ctx = SimpleContext(codes);
ctx.IsEtch = true;
ctx.LibraryFile = "EtchN2.lib";
var output = WriteFeature(config, ctx);
// Should use #148 for all moves, not #126 for lead-in
Assert.DoesNotContain("F#126", output);
Assert.Contains("F#148", output);
}
[Fact]
@@ -378,7 +425,7 @@ public class CincinnatiFeatureWriterTests
ctx.IsLastFeatureOnSheet = false;
var output = WriteFeature(config, ctx);
Assert.Contains("M47 P2000(Safety Headraise)", output);
Assert.Contains("M47 P2000 (Safety Headraise)", output);
}
[Fact]
@@ -404,7 +451,7 @@ public class CincinnatiFeatureWriterTests
var lines = output.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
// Find indices of key lines
var rapidIdx = Array.FindIndex(lines, l => l.Contains("G0X"));
var rapidIdx = Array.FindIndex(lines, l => l.Contains("G0 X"));
var partIdx = Array.FindIndex(lines, l => l.Contains("PART:"));
var g89Idx = Array.FindIndex(lines, l => l.Contains("G89"));
var g84Idx = Array.FindIndex(lines, l => l.Contains("G84"));
OpenNest.Tests/Cincinnati/CincinnatiPostProcessorTests.cs
+28 -15
View File
@@ -17,7 +17,6 @@ public class CincinnatiPostProcessorTests
var config = new CincinnatiPostConfig
{
ConfigurationName = "CL940",
DefaultLibraryFile = "MS135N2PANEL.lib",
PostedAccuracy = 4
};
var post = new CincinnatiPostProcessor(config);
@@ -72,7 +71,7 @@ public class CincinnatiPostProcessorTests
var output = Encoding.UTF8.GetString(ms.ToArray());
// Should only have one sheet subprogram call in main
Assert.Contains("N1M98 P101 (SHEET 1)", output);
Assert.Contains("N1 M98 P101 (SHEET 1)", output);
Assert.DoesNotContain("SHEET 2", output);
}
@@ -104,10 +103,19 @@ public class CincinnatiPostProcessorTests
var config = new CincinnatiPostConfig
{
ConfigurationName = "CL940_CORONA",
DefaultLibraryFile = "MS135N2PANEL.lib",
DefaultAssistGas = "N2",
DefaultEtchGas = "N2",
PostedUnits = Units.Inches,
KerfCompensation = KerfMode.ControllerSide,
UseAntiDive = true
UseAntiDive = true,
MaterialLibraries = new()
{
new MaterialLibraryEntry { Material = "Mild Steel", Thickness = 0.135, Gas = "N2", Library = "MS135N2PANEL.lib" }
},
EtchLibraries = new()
{
new EtchLibraryEntry { Gas = "N2", Library = "EtchN2.lib" }
}
};
var opts = new JsonSerializerOptions
@@ -119,10 +127,15 @@ public class CincinnatiPostProcessorTests
var deserialized = JsonSerializer.Deserialize<CincinnatiPostConfig>(json, opts);
Assert.Equal("CL940_CORONA", deserialized.ConfigurationName);
Assert.Equal("MS135N2PANEL.lib", deserialized.DefaultLibraryFile);
Assert.Equal("N2", deserialized.DefaultAssistGas);
Assert.Equal("N2", deserialized.DefaultEtchGas);
Assert.Equal(Units.Inches, deserialized.PostedUnits);
Assert.Equal(KerfMode.ControllerSide, deserialized.KerfCompensation);
Assert.True(deserialized.UseAntiDive);
Assert.Single(deserialized.MaterialLibraries);
Assert.Equal("MS135N2PANEL.lib", deserialized.MaterialLibraries[0].Library);
Assert.Single(deserialized.EtchLibraries);
Assert.Equal("EtchN2.lib", deserialized.EtchLibraries[0].Library);
// Enums serialize as strings
Assert.Contains("\"Inches\"", json);
@@ -157,21 +170,21 @@ public class CincinnatiPostProcessorTests
var output = Encoding.UTF8.GetString(ms.ToArray());
// Sheet should contain M98 call to part sub-program
Assert.Contains("M98P200", output);
Assert.Contains("M98 P200", output);
// Should have G92 for local coordinate positioning
Assert.Contains("G92X0Y0", output);
Assert.Contains("G92 X0 Y0", output);
// Part sub-program definition
Assert.Contains(":200", output);
Assert.Contains("G84", output);
// Sub-program ends with G0X0Y0 and M99
Assert.Contains("G0X0Y0", output);
Assert.Contains("M99(END OF Square)", output);
// Sub-program ends with G0 X0 Y0 and M99
Assert.Contains("G0 X0 Y0", output);
Assert.Contains("M99 (END OF Square)", output);
// G92 restore after M98 call
Assert.Contains("G92X", output);
Assert.Contains("G92 X", output);
}
[Fact]
@@ -198,7 +211,7 @@ public class CincinnatiPostProcessorTests
var output = Encoding.UTF8.GetString(ms.ToArray());
// Both parts should call the same sub-program
var m98Count = System.Text.RegularExpressions.Regex.Matches(output, "M98P200").Count;
var m98Count = System.Text.RegularExpressions.Regex.Matches(output, @"M98 P200\b").Count;
Assert.Equal(2, m98Count);
// Only one sub-program definition
@@ -238,8 +251,8 @@ public class CincinnatiPostProcessorTests
// Should have two different sub-programs
Assert.Contains(":200", output);
Assert.Contains(":201", output);
Assert.Contains("M98P200", output);
Assert.Contains("M98P201", output);
Assert.Contains("M98 P200", output);
Assert.Contains("M98 P201", output);
}
[Fact]
@@ -268,7 +281,7 @@ public class CincinnatiPostProcessorTests
var output = Encoding.UTF8.GetString(ms.ToArray());
// Regular part uses sub-program
Assert.Contains("M98P200", output);
Assert.Contains("M98 P200", output);
Assert.Contains(":200", output);
// Cutoff should NOT have its own sub-program
OpenNest.Tests/Cincinnati/CincinnatiPreambleWriterTests.cs
+7 -8
View File
@@ -13,14 +13,13 @@ public class CincinnatiPreambleWriterTests
var config = new CincinnatiPostConfig
{
ConfigurationName = "CL940",
PostedUnits = Units.Inches,
DefaultLibraryFile = "MS135N2PANEL.lib"
PostedUnits = Units.Inches
};
var sb = new StringBuilder();
using var sw = new StringWriter(sb);
var writer = new CincinnatiPreambleWriter(config);
writer.WriteMainProgram(sw, "TestNest", "Mild Steel, 10GA", 2);
writer.WriteMainProgram(sw, "TestNest", "Mild Steel, 10GA", 2, "MS135N2PANEL.lib");
var output = sb.ToString();
Assert.Contains("( NEST TestNest )", output);
@@ -30,8 +29,8 @@ public class CincinnatiPreambleWriterTests
Assert.Contains("G89 P MS135N2PANEL.lib", output);
Assert.Contains("M98 P100 (Variable Declaration)", output);
Assert.Contains("GOTO1 (GOTO SHEET NUMBER)", output);
Assert.Contains("N1M98 P101 (SHEET 1)", output);
Assert.Contains("N2M98 P102 (SHEET 2)", output);
Assert.Contains("N1 M98 P101 (SHEET 1)", output);
Assert.Contains("N2 M98 P102 (SHEET 2)", output);
Assert.Contains("M30 (END OF MAIN)", output);
}
@@ -43,7 +42,7 @@ public class CincinnatiPreambleWriterTests
using var sw = new StringWriter(sb);
var writer = new CincinnatiPreambleWriter(config);
writer.WriteMainProgram(sw, "Test", "", 1);
writer.WriteMainProgram(sw, "Test", "", 1, "");
Assert.Contains("G21", sb.ToString());
}
@@ -56,7 +55,7 @@ public class CincinnatiPreambleWriterTests
using var sw = new StringWriter(sb);
var writer = new CincinnatiPreambleWriter(config);
writer.WriteMainProgram(sw, "Test", "", 1);
writer.WriteMainProgram(sw, "Test", "", 1, "");
Assert.Contains("G61", sb.ToString());
}
@@ -69,7 +68,7 @@ public class CincinnatiPreambleWriterTests
using var sw = new StringWriter(sb);
var writer = new CincinnatiPreambleWriter(config);
writer.WriteMainProgram(sw, "Test", "", 1);
writer.WriteMainProgram(sw, "Test", "", 1, "");
Assert.DoesNotContain("G61", sb.ToString());
}
OpenNest.Tests/Cincinnati/CincinnatiSheetWriterTests.cs
+82 -7
View File
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
@@ -14,7 +15,6 @@ public class CincinnatiSheetWriterTests
{
var config = new CincinnatiPostConfig
{
DefaultLibraryFile = "MS135N2PANEL.lib",
PostedAccuracy = 4
};
var plate = new Plate(48.0, 96.0);
@@ -24,14 +24,15 @@ public class CincinnatiSheetWriterTests
using var sw = new StringWriter(sb);
var sheetWriter = new CincinnatiSheetWriter(config, new ProgramVariableManager());
sheetWriter.Write(sw, plate, "TestNest", 1, 101);
sheetWriter.Write(sw, plate, "TestNest", 1, 101, "MS135N2PANEL.lib", "EtchN2.lib");
var output = sb.ToString();
Assert.Contains(":101", output);
Assert.Contains("( Sheet 1 )", output);
Assert.Contains("#110=", output);
Assert.Contains("#111=", output);
Assert.Contains("G92X#5021Y#5022", output);
Assert.Contains("G92 X#5021 Y#5022", output);
Assert.Contains("G89 P MS135N2PANEL.lib", output);
Assert.Contains("M99", output);
}
@@ -50,11 +51,11 @@ public class CincinnatiSheetWriterTests
using var sw = new StringWriter(sb);
var sheetWriter = new CincinnatiSheetWriter(config, new ProgramVariableManager());
sheetWriter.Write(sw, plate, "TestNest", 1, 101);
sheetWriter.Write(sw, plate, "TestNest", 1, 101, "", "");
var output = sb.ToString();
Assert.Contains("M42", output);
Assert.Contains("G0X0Y0", output);
Assert.Contains("G0 X0 Y0", output);
Assert.Contains("M50", output);
}
@@ -68,7 +69,7 @@ public class CincinnatiSheetWriterTests
using var sw = new StringWriter(sb);
var sheetWriter = new CincinnatiSheetWriter(config, new ProgramVariableManager());
sheetWriter.Write(sw, plate, "TestNest", 1, 101);
sheetWriter.Write(sw, plate, "TestNest", 1, 101, "", "");
Assert.Equal("", sb.ToString());
}
@@ -96,7 +97,7 @@ public class CincinnatiSheetWriterTests
using var sw = new StringWriter(sb);
var sheetWriter = new CincinnatiSheetWriter(config, new ProgramVariableManager());
sheetWriter.Write(sw, plate, "TestNest", 1, 101);
sheetWriter.Write(sw, plate, "TestNest", 1, 101, "", "");
var output = sb.ToString();
// Should have two G84 pierce commands (one per contour)
@@ -104,6 +105,80 @@ public class CincinnatiSheetWriterTests
Assert.Equal(2, g84Count);
}
[Fact]
public void WriteSheet_EtchFeaturesOrderedBeforeCut()
{
var config = new CincinnatiPostConfig { PostedAccuracy = 4 };
var pgm = new Program();
// Cut contour first in program
pgm.Codes.Add(new RapidMove(0, 0));
pgm.Codes.Add(new LinearMove(5, 0) { Layer = LayerType.Cut });
pgm.Codes.Add(new LinearMove(5, 5) { Layer = LayerType.Cut });
// Etch contour second in program
pgm.Codes.Add(new RapidMove(1, 1));
pgm.Codes.Add(new LinearMove(2, 1) { Layer = LayerType.Scribe });
pgm.Codes.Add(new LinearMove(2, 2) { Layer = LayerType.Scribe });
var plate = new Plate(48.0, 96.0);
plate.Parts.Add(new Part(new Drawing("MixedPart", pgm)));
var sb = new StringBuilder();
using var sw = new StringWriter(sb);
var sheetWriter = new CincinnatiSheetWriter(config, new ProgramVariableManager());
sheetWriter.Write(sw, plate, "TestNest", 1, 101, "MS250O2.lib", "EtchN2.lib");
var output = sb.ToString();
// Etch (G85) should appear before cut (G84)
var g85Idx = output.IndexOf("G85");
var g84Idx = output.IndexOf("G84");
Assert.True(g85Idx >= 0, "G85 should be present for etch");
Assert.True(g84Idx >= 0, "G84 should be present for cut");
Assert.True(g85Idx < g84Idx, "G85 (etch) should come before G84 (cut)");
// Etch uses etch library
Assert.Contains("G89 P EtchN2.lib", output);
// Cut uses cut library
Assert.Contains("G89 P MS250O2.lib", output);
}
[Fact]
public void IsFeatureEtch_ReturnsTrueForScribeLayer()
{
var codes = new List<ICode>
{
new RapidMove(0, 0),
new LinearMove(1, 0) { Layer = LayerType.Scribe },
new LinearMove(1, 1) { Layer = LayerType.Scribe }
};
Assert.True(CincinnatiSheetWriter.IsFeatureEtch(codes));
}
[Fact]
public void IsFeatureEtch_ReturnsFalseForCutLayer()
{
var codes = new List<ICode>
{
new RapidMove(0, 0),
new LinearMove(1, 0) { Layer = LayerType.Cut },
new LinearMove(1, 1) { Layer = LayerType.Cut }
};
Assert.False(CincinnatiSheetWriter.IsFeatureEtch(codes));
}
[Fact]
public void IsFeatureEtch_ReturnsFalseForRapidsOnly()
{
var codes = new List<ICode>
{
new RapidMove(0, 0)
};
Assert.False(CincinnatiSheetWriter.IsFeatureEtch(codes));
}
private static Program CreateSimpleProgram()
{
var pgm = new Program();