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

fix: prevent scientific notation in G-code output

Browse Source 
ProgramReader treats 'E' as a code letter, so values like
"6.66E-08" get split into X:"6.66" and E:"-08", corrupting
the parsed coordinate. Use fixed-point format string instead.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-06 20:54:20 -05:00
parent 1c4015ac62
commit 6561b478a5
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenNest/IO/NestWriter.cs
View File

@@ -13,11 +13,18 @@ namespace OpenNest.IO
public sealed class NestWriter public sealed class NestWriter
{ {
/// <summary> /// <summary>
/// Number of decimal places the output is round to. /// Number of decimal places the output is round to.
/// This number must have more decimal places than Tolerance.Epsilon /// This number must have more decimal places than Tolerance.Epsilon
/// </summary> /// </summary>
private const int OutputPrecision = 10; private const int OutputPrecision = 10;
/// <summary>
/// Fixed-point format string that avoids scientific notation.
/// ProgramReader treats 'E' as a code letter, so "6.66E-08" would be
/// split into X:"6.66" and E:"-08", corrupting the parsed value.
/// </summary>
private const string CoordinateFormat = "0.##########";
private readonly Nest nest; private readonly Nest nest;
private ZipArchive zipArchive; private ZipArchive zipArchive;
private Dictionary<int, Drawing> drawingDict; private Dictionary<int, Drawing> drawingDict;
@@ -284,7 +291,9 @@ namespace OpenNest.IO
var match = drawingDict.Where(dwg => dwg.Value == part.BaseDrawing).FirstOrDefault(); var match = drawingDict.Where(dwg => dwg.Value == part.BaseDrawing).FirstOrDefault();
var id = match.Key; var id = match.Key;
writer.WriteLine("G00X{0}Y{1}", part.Location.X, part.Location.Y); writer.WriteLine("G00X{0}Y{1}",
part.Location.X.ToString(CoordinateFormat),
part.Location.Y.ToString(CoordinateFormat));
writer.WriteLine("G65P{0}R{1}", id, Angle.ToDegrees(part.Rotation)); writer.WriteLine("G65P{0}R{1}", id, Angle.ToDegrees(part.Rotation));
} }
@@ -317,22 +326,15 @@ namespace OpenNest.IO
var sb = new StringBuilder(); var sb = new StringBuilder();
var arcMove = (ArcMove)code; var arcMove = (ArcMove)code;
var x = System.Math.Round(arcMove.EndPoint.X, OutputPrecision).ToString(CoordinateFormat);
var y = System.Math.Round(arcMove.EndPoint.Y, OutputPrecision).ToString(CoordinateFormat);
var i = System.Math.Round(arcMove.CenterPoint.X, OutputPrecision).ToString(CoordinateFormat);
var j = System.Math.Round(arcMove.CenterPoint.Y, OutputPrecision).ToString(CoordinateFormat);
if (arcMove.Rotation == RotationType.CW) if (arcMove.Rotation == RotationType.CW)
{ sb.Append(string.Format("G02X{0}Y{1}I{2}J{3}", x, y, i, j));
sb.Append(string.Format("G02X{0}Y{1}I{2}J{3}",
System.Math.Round(arcMove.EndPoint.X, OutputPrecision),
System.Math.Round(arcMove.EndPoint.Y, OutputPrecision),
System.Math.Round(arcMove.CenterPoint.X, OutputPrecision),
System.Math.Round(arcMove.CenterPoint.Y, OutputPrecision)));
}
else else
{ sb.Append(string.Format("G03X{0}Y{1}I{2}J{3}", x, y, i, j));
sb.Append(string.Format("G03X{0}Y{1}I{2}J{3}",
System.Math.Round(arcMove.EndPoint.X, OutputPrecision),
System.Math.Round(arcMove.EndPoint.Y, OutputPrecision),
System.Math.Round(arcMove.CenterPoint.X, OutputPrecision),
System.Math.Round(arcMove.CenterPoint.Y, OutputPrecision)));
}
if (arcMove.Layer != LayerType.Cut) if (arcMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(arcMove.Layer)); sb.Append(GetLayerString(arcMove.Layer));
@@ -352,8 +354,8 @@ namespace OpenNest.IO
var linearMove = (LinearMove)code; var linearMove = (LinearMove)code;
sb.Append(string.Format("G01X{0}Y{1}", sb.Append(string.Format("G01X{0}Y{1}",
System.Math.Round(linearMove.EndPoint.X, OutputPrecision), System.Math.Round(linearMove.EndPoint.X, OutputPrecision).ToString(CoordinateFormat),
System.Math.Round(linearMove.EndPoint.Y, OutputPrecision))); System.Math.Round(linearMove.EndPoint.Y, OutputPrecision).ToString(CoordinateFormat)));
if (linearMove.Layer != LayerType.Cut) if (linearMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(linearMove.Layer)); sb.Append(GetLayerString(linearMove.Layer));
@@ -366,8 +368,8 @@ namespace OpenNest.IO
var rapidMove = (RapidMove)code; var rapidMove = (RapidMove)code;
return string.Format("G00X{0}Y{1}", return string.Format("G00X{0}Y{1}",
System.Math.Round(rapidMove.EndPoint.X, OutputPrecision), System.Math.Round(rapidMove.EndPoint.X, OutputPrecision).ToString(CoordinateFormat),
System.Math.Round(rapidMove.EndPoint.Y, OutputPrecision)); System.Math.Round(rapidMove.EndPoint.Y, OutputPrecision).ToString(CoordinateFormat));
} }
case CodeType.SetFeedrate: case CodeType.SetFeedrate: