diff options
Diffstat (limited to 'UVtools.Core/Gerber/GerberDocument.cs')
| -rw-r--r-- | UVtools.Core/Gerber/GerberDocument.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/UVtools.Core/Gerber/GerberDocument.cs b/UVtools.Core/Gerber/GerberDocument.cs index 271d371..3e4e04f 100644 --- a/UVtools.Core/Gerber/GerberDocument.cs +++ b/UVtools.Core/Gerber/GerberDocument.cs @@ -105,6 +105,12 @@ public class GerberDocument if (line == string.Empty) continue; if (line.StartsWith("M02")) break; + if (currentMacro is not null && line[0] == '%') + { + currentMacro = null; + continue; + } + var accumulatedLine = line; while (!accumulatedLine.Contains('*') && (line = file.ReadLine()) is not null) { @@ -430,8 +436,7 @@ public class GerberDocument } else if (d == 3) { - currentAperture.DrawFlashD3(mat, new PointF((float)nowX, (float)nowY), - document.PolarityColor, enableAntiAliasing ? LineType.AntiAlias : LineType.EightConnected); + currentAperture.DrawFlashD3(mat, new PointF((float)nowX, (float)nowY), document.PolarityColor, enableAntiAliasing ? LineType.AntiAlias : LineType.EightConnected); //CvInvoke.Imshow("G37", mat); //CvInvoke.WaitKey(); } |