From 4101815b2fac78be67c1cd8d8c6520d41dcac7cf Mon Sep 17 00:00:00 2001 From: jaseg Date: Sun, 23 Jan 2022 21:19:51 +0100 Subject: Fix more bugs --- gerbonara/gerber/tests/resources/fritzing/combined.gbl | 9 +++++---- gerbonara/gerber/tests/resources/fritzing/combined.gbo | 9 +++++---- gerbonara/gerber/tests/resources/fritzing/combined.gbs | 10 ++++++---- gerbonara/gerber/tests/resources/fritzing/combined.gm1 | 9 +++++---- gerbonara/gerber/tests/resources/fritzing/combined.gtl | 9 +++++---- gerbonara/gerber/tests/resources/fritzing/combined.gto | 9 +++++---- gerbonara/gerber/tests/resources/fritzing/combined.gts | 9 +++++---- 7 files changed, 36 insertions(+), 28 deletions(-) (limited to 'gerbonara/gerber/tests/resources/fritzing') diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gbl b/gerbonara/gerber/tests/resources/fritzing/combined.gbl index ad7ca19..13b6118 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gbl +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gbl @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -8487,7 +8488,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D29* X01338Y00039D02* X01444Y01876D03* @@ -16936,7 +16937,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D38* X02637Y00039D02* X02743Y01876D03* @@ -25385,7 +25386,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D47* X02598Y02677D02* X00761Y02783D03* @@ -33827,4 +33828,4 @@ X02345Y03029D01* G37* D02* G04 End of Copper0* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gbo b/gerbonara/gerber/tests/resources/fritzing/combined.gbo index 365bc71..fbb0103 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gbo +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gbo @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -8633,7 +8634,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D21* X01777Y02388D02* X01786Y02388D01* @@ -17260,7 +17261,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D22* X03076Y02388D02* X03085Y02388D01* @@ -25887,7 +25888,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D23* X00249Y03116D02* X00249Y03125D01* @@ -34507,4 +34508,4 @@ X02357Y02948D02* X02357Y02949D01* D02* G04 End of Silk0* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gbs b/gerbonara/gerber/tests/resources/fritzing/combined.gbs index 737b8e4..72ac193 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gbs +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gbs @@ -1,3 +1,5 @@ +G04 file was processed by a buggy GerberTools version. +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -165,7 +167,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D28* X01338Y00039D02* X01751Y01768D03* @@ -296,7 +298,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D36* X02637Y00039D02* X03049Y01768D03* @@ -427,7 +429,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D44* X02598Y02677D02* X00869Y03090D03* @@ -551,4 +553,4 @@ X01819Y03591D03* X02019Y03591D03* X02219Y03591D03* G04 End of Mask0* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gm1 b/gerbonara/gerber/tests/resources/fritzing/combined.gm1 index 4812d78..71a8a95 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gm1 +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gm1 @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -2538,7 +2539,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D21* X01443Y02598D02* X01444Y02598D01* @@ -5070,7 +5071,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D22* X02742Y02598D02* X02743Y02598D01* @@ -7602,7 +7603,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D23* X00039Y02781D02* X00039Y02783D01* @@ -10127,4 +10128,4 @@ X00040Y02781D01* X00039Y02781D01* D02* G04 End of contour* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gtl b/gerbonara/gerber/tests/resources/fritzing/combined.gtl index 0689715..ac17106 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gtl +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gtl @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -405,7 +406,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D30* X01338Y00039D02* X01751Y01768D03* @@ -768,7 +769,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D40* X02637Y00039D02* X03049Y01768D03* @@ -1131,7 +1132,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D50* X02598Y02677D02* X00869Y03090D03* @@ -1487,4 +1488,4 @@ D02* X01194Y03540D02* X01194Y03464D01* G04 End of Copper1* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gto b/gerbonara/gerber/tests/resources/fritzing/combined.gto index 65d56e2..a059149 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gto +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gto @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -11538,7 +11539,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D26* X01701Y02265D02* X02501Y02265D01* @@ -23054,7 +23055,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D31* X02999Y02265D02* X03800Y02265D01* @@ -34570,7 +34571,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D36* X00371Y03040D02* X00371Y03840D01* @@ -46079,4 +46080,4 @@ X02356Y02929D02* X02356Y02939D01* D02* G04 End of Silk1* -M02* \ No newline at end of file +M02* diff --git a/gerbonara/gerber/tests/resources/fritzing/combined.gts b/gerbonara/gerber/tests/resources/fritzing/combined.gts index 80f0102..ab186a8 100644 --- a/gerbonara/gerber/tests/resources/fritzing/combined.gts +++ b/gerbonara/gerber/tests/resources/fritzing/combined.gts @@ -1,3 +1,4 @@ +G04 file manually fixed for GerberTools #86 / #143* %MOIN*% %OFA0B0*% %FSLAX23Y23*% @@ -165,7 +166,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D28* X01338Y00039D02* X01751Y01768D03* @@ -296,7 +297,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D36* X02637Y00039D02* X03049Y01768D03* @@ -427,7 +428,7 @@ G04 DOUBLE SIDED* G04 HOLES PLATED* G04 CONTOUR ON CENTER OF CONTOUR VECTOR* G90* -G04 skipping 70 +G04 skipping 70* D44* X02598Y02677D02* X00869Y03090D03* @@ -551,4 +552,4 @@ X01819Y03591D03* X02019Y03591D03* X02219Y03591D03* G04 End of Mask1* -M02* \ No newline at end of file +M02* -- cgit