Add Zuken tests and fix parsing

4 files changed, 571 insertions, 0 deletions

diff --git a/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdl b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdl
new file mode 100644
index 0000000..2b6494c
--- /dev/null
+++ b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdl
@@ -0,0 +1,74 @@
+                ************************

+                *****  DRILL LIST  *****

+                ************************

+

+ Date                 : Sat Feb 05 23:42:05 2022

+ Host                 : Windows_Hostname

+ User                 : Windows_User

+ Output Data          : C:/TEMP/Not_Actual_Path/DF_Drill_thru_plt.fdr

+ Output List          : C:/TEMP/Not_Actual_Path/DF_Drill_thru_plt.fdl

+

+ Target File          : C:/TEMP/Not_Actual_Path/routed.dsgn

+ From-To              : Only through

+ Object               : Round hole

+                      : Slot hole

+                      : Rectangular hole

+                      : Hole in padstack (Round hole)

+                      : Hole in padstack (Slot hole)

+                      : Hole in padstack (Rectangular hole)

+ Slot Hole            : Alternately from both ends(Migration rate: 0.50000/Odd number: Off)

+ Rectangular Hole     : Alternately from both ends(Migration rate: 0.50000/Odd number: Off)

+ Diameter/Hole Type   : All

+ Plating Attribute    : Plated

+ Embedded Comp. Via   : Do not output

+

+ Reference Point      : 0.00000, 0.00000 [mm]

+ Mirror               : Off

+ Rotate               : 0-degree (No rotation)

+ Scale                : 1.00000

+ Offset               : 0.00000, 0.00000 [mm]

+

+ Toolpath Sorting     : N sort

+ Test Coupon          : Timing: 0 / Number of outputs: 1

+

+

+ NCF File             : C:/Project_Path/settings/ncf/Excellon2.ncf

+ NCF Comment          : EXCELLON2 FORMAT

+ Data Type            : Excellon2 Type

+ Character Code       : ASCII

+ EOB Code             : LF

+ EOR Code             : SPACE

+

+ Unit                 : inch

+ Coordinate Format    : 4V4

+ Round Unit           : 0.00010

+ Inc. / Abs.          : Absolute

+ Zero Suppress        : Trailing Zero Suppress

+ Omitting Coordinates : Omit

+ Zero Return          : During Tool Changing: Do not make

+

+

+ Assign Code          : Auto

+ Distinguish Tools    : Hole type: Off

+                      : Round hole and slot hole(rectangular hole): On

+                      : Plating attribute: Off

+                      : Embedded component via attribute: On

+

+ Tool Table           : 

+============================================================================================

+| No. | Hole  | Code | Tool  | Diameter |        | Corner | Angle  |   Hole    |  Plating  |

+|     | Shape |      | Shape |  Width   | Height | Radius |        |   Type    | Attribute |

+|-----+-------+------+-------+----------+--------+--------+--------+-----------+-----------|

+|   1 | Round | T01  | Round |   0.1000 | ------ | ------ | ------ | Undefined | Plated    |

+============================================================================================

+

+ Tool Count           : 

+======================================================================

+|  No.  | Code |     Hit     | Test Coupon | Inspection | Moved Dis. |

+|-------+------+-------------+-------------+------------+------------|

+|     1 | T01  |         100 |           0 |          0 | 1234.56789 |

+|-------+------+-------------+-------------+------------+------------|

+| Total        |         100 |           0 |          0 | 1234.56789 |

+======================================================================

+

+ Data Area            : min = ( 1.00000, 1.00000 ), max = ( 101.00000, 101.00000 )

diff --git a/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdr b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdr
new file mode 100644
index 0000000..077169d
--- /dev/null
+++ b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_nplt.fdr
@@ -0,0 +1,30 @@
+M48
+INCH,LZ
+ICI,OFF
+VER,1
+FMAT,2
+DETECT,ON
+ATC,ON
+T1C0.1260
+T2C0.1280
+%
+M06
+T01
+X00060236Y-00038189
+X00043307Y-00059055
+X00043307Y-00038189
+X00029528Y-00059055
+X00029528Y-00023622
+X00064961Y-00023622
+X00060236Y-00059055
+X00064961Y-00059055
+M06
+T02
+X00055909Y-00023685
+X00060909Y-00023685
+X00048094Y-00023685
+X00053094Y-00023685
+M06
+T00
+M00
+
diff --git a/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdl b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdl
new file mode 100644
index 0000000..2b6494c
--- /dev/null
+++ b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdl
@@ -0,0 +1,74 @@
+                ************************

+                *****  DRILL LIST  *****

+                ************************

+

+ Date                 : Sat Feb 05 23:42:05 2022

+ Host                 : Windows_Hostname

+ User                 : Windows_User

+ Output Data          : C:/TEMP/Not_Actual_Path/DF_Drill_thru_plt.fdr

+ Output List          : C:/TEMP/Not_Actual_Path/DF_Drill_thru_plt.fdl

+

+ Target File          : C:/TEMP/Not_Actual_Path/routed.dsgn

+ From-To              : Only through

+ Object               : Round hole

+                      : Slot hole

+                      : Rectangular hole

+                      : Hole in padstack (Round hole)

+                      : Hole in padstack (Slot hole)

+                      : Hole in padstack (Rectangular hole)

+ Slot Hole            : Alternately from both ends(Migration rate: 0.50000/Odd number: Off)

+ Rectangular Hole     : Alternately from both ends(Migration rate: 0.50000/Odd number: Off)

+ Diameter/Hole Type   : All

+ Plating Attribute    : Plated

+ Embedded Comp. Via   : Do not output

+

+ Reference Point      : 0.00000, 0.00000 [mm]

+ Mirror               : Off

+ Rotate               : 0-degree (No rotation)

+ Scale                : 1.00000

+ Offset               : 0.00000, 0.00000 [mm]

+

+ Toolpath Sorting     : N sort

+ Test Coupon          : Timing: 0 / Number of outputs: 1

+

+

+ NCF File             : C:/Project_Path/settings/ncf/Excellon2.ncf

+ NCF Comment          : EXCELLON2 FORMAT

+ Data Type            : Excellon2 Type

+ Character Code       : ASCII

+ EOB Code             : LF

+ EOR Code             : SPACE

+

+ Unit                 : inch

+ Coordinate Format    : 4V4

+ Round Unit           : 0.00010

+ Inc. / Abs.          : Absolute

+ Zero Suppress        : Trailing Zero Suppress

+ Omitting Coordinates : Omit

+ Zero Return          : During Tool Changing: Do not make

+

+

+ Assign Code          : Auto

+ Distinguish Tools    : Hole type: Off

+                      : Round hole and slot hole(rectangular hole): On

+                      : Plating attribute: Off

+                      : Embedded component via attribute: On

+

+ Tool Table           : 

+============================================================================================

+| No. | Hole  | Code | Tool  | Diameter |        | Corner | Angle  |   Hole    |  Plating  |

+|     | Shape |      | Shape |  Width   | Height | Radius |        |   Type    | Attribute |

+|-----+-------+------+-------+----------+--------+--------+--------+-----------+-----------|

+|   1 | Round | T01  | Round |   0.1000 | ------ | ------ | ------ | Undefined | Plated    |

+============================================================================================

+

+ Tool Count           : 

+======================================================================

+|  No.  | Code |     Hit     | Test Coupon | Inspection | Moved Dis. |

+|-------+------+-------------+-------------+------------+------------|

+|     1 | T01  |         100 |           0 |          0 | 1234.56789 |

+|-------+------+-------------+-------------+------------+------------|

+| Total        |         100 |           0 |          0 | 1234.56789 |

+======================================================================

+

+ Data Area            : min = ( 1.00000, 1.00000 ), max = ( 101.00000, 101.00000 )

diff --git a/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdr b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdr
new file mode 100644
index 0000000..9e91994
--- /dev/null
+++ b/gerbonara/tests/resources/zuken-emulated/Drill/8seg_Driver__routed_Drill_thru_plt.fdr/8seg_Driver__routed_Drill_thru_plt.fdr
@@ -0,0 +1,393 @@
+M48
+INCH,LZ
+ICI,OFF
+VER,1
+FMAT,2
+DETECT,ON
+ATC,ON
+T1C0.0157
+T2C0.0350
+T3C0.0394
+T4C0.0472
+T5C0.0512
+T6C0.0618
+%
+M06
+T01
+X00031339Y-00031811
+X00031654Y-00031299
+X00032047Y-00029921
+X00032402Y-00058691
+X00032913Y-00029370
+X00033858Y-00030354
+X00034606Y-00059961
+X00034680Y-00059099
+X00035827Y-00035276
+X00036220Y-00034685
+X00036909Y-00036713
+X00037520Y-00031969
+X00037795Y-00033819
+X00038150Y-00034094
+X00038780Y-00034528
+X00038780Y-00034882
+X00039173Y-00026850
+X00039173Y-00027323
+X00039606Y-00026850
+X00039606Y-00027244
+X00040394Y-00035827
+X00041640Y-00036509
+X00041640Y-00036890
+X00042062Y-00035143
+X00042800Y-00035074
+X00042874Y-00035551
+X00043268Y-00035581
+X00043465Y-00030551
+X00043937Y-00031220
+X00044066Y-00034921
+X00044094Y-00035669
+X00046024Y-00031890
+X00046102Y-00028780
+X00046102Y-00029252
+X00046137Y-00031501
+X00046142Y-00031102
+X00046142Y-00035981
+X00046339Y-00032441
+X00046575Y-00029252
+X00046969Y-00032638
+X00047283Y-00035394
+X00047283Y-00035748
+X00047756Y-00030000
+X00047756Y-00030315
+X00047992Y-00032717
+X00048071Y-00030000
+X00048071Y-00030315
+X00048268Y-00034094
+X00048307Y-00032717
+X00048312Y-00031147
+X00048568Y-00036314
+X00048661Y-00031142
+X00048701Y-00034252
+X00048996Y-00036339
+X00049055Y-00034843
+X00049286Y-00032525
+X00049409Y-00036624
+X00049921Y-00059921
+X00050098Y-00031398
+X00050236Y-00059606
+X00050276Y-00045984
+X00050394Y-00038583
+X00050394Y-00038976
+X00050394Y-00039370
+X00050394Y-00039764
+X00050394Y-00040157
+X00050394Y-00051181
+X00050394Y-00054331
+X00050394Y-00054724
+X00050394Y-00055118
+X00050394Y-00055512
+X00050394Y-00055906
+X00050483Y-00032374
+X00050630Y-00034449
+X00050787Y-00038583
+X00050787Y-00038976
+X00050787Y-00039370
+X00050787Y-00039764
+X00050787Y-00040157
+X00050787Y-00049016
+X00050787Y-00049409
+X00050787Y-00049803
+X00050787Y-00050197
+X00050787Y-00050591
+X00050787Y-00054331
+X00050787Y-00054724
+X00050787Y-00055118
+X00050787Y-00055512
+X00050787Y-00055906
+X00050945Y-00032362
+X00050945Y-00031969
+X00050979Y-00031161
+X00050984Y-00043898
+X00050984Y-00044291
+X00050984Y-00044685
+X00050984Y-00045079
+X00050984Y-00045472
+X00051024Y-00030433
+X00051181Y-00038583
+X00051181Y-00038976
+X00051181Y-00039370
+X00051181Y-00039764
+X00051181Y-00040157
+X00051181Y-00049016
+X00051181Y-00049409
+X00051181Y-00049803
+X00051181Y-00050197
+X00051181Y-00050591
+X00051181Y-00054331
+X00051181Y-00054724
+X00051181Y-00055118
+X00051181Y-00055512
+X00051181Y-00055906
+X00051378Y-00043898
+X00051378Y-00044291
+X00051378Y-00044685
+X00051378Y-00045079
+X00051378Y-00045472
+X00051575Y-00027854
+X00051575Y-00038583
+X00051575Y-00038976
+X00051575Y-00039370
+X00051575Y-00039764
+X00051575Y-00040157
+X00051575Y-00049016
+X00051575Y-00049409
+X00051575Y-00049803
+X00051575Y-00050197
+X00051575Y-00050591
+X00051575Y-00054331
+X00051575Y-00054724
+X00051575Y-00055118
+X00051575Y-00055512
+X00051575Y-00055906
+X00051614Y-00047402
+X00051772Y-00043898
+X00051772Y-00044291
+X00051772Y-00044685
+X00051772Y-00045079
+X00051772Y-00045472
+X00051969Y-00049016
+X00051969Y-00049409
+X00051969Y-00049803
+X00051969Y-00050197
+X00051969Y-00050591
+X00052047Y-00053780
+X00052126Y-00037598
+X00052567Y-00037607
+X00052835Y-00058937
+X00053150Y-00025984
+X00053250Y-00036259
+X00053268Y-00035866
+X00053346Y-00025591
+X00054134Y-00027165
+X00054528Y-00027165
+X00055236Y-00059016
+X00056102Y-00036909
+X00056614Y-00034921
+X00057020Y-00059382
+X00057591Y-00059325
+X00057598Y-00060197
+X00058056Y-00058410
+X00058189Y-00037244
+X00058386Y-00060512
+X00059331Y-00035472
+X00060709Y-00036014
+X00061417Y-00035157
+X00061811Y-00035551
+X00061850Y-00035157
+X00061890Y-00056939
+X00062106Y-00026083
+X00062913Y-00031417
+X00063287Y-00025787
+X00063465Y-00035984
+X00064016Y-00036693
+X00064065Y-00036299
+X00064724Y-00032520
+X00065157Y-00032520
+X00065157Y-00032874
+X00065551Y-00037323
+X00065906Y-00036850
+X00066437Y-00035846
+M06
+T02
+X00055709Y-00027283
+X00056610Y-00027283
+X00057008Y-00024685
+X00057409Y-00025386
+X00057811Y-00024685
+X00058213Y-00025386
+X00058614Y-00024685
+X00059016Y-00025386
+X00059417Y-00024685
+X00059819Y-00025386
+X00060209Y-00027283
+X00061110Y-00027283
+X00047894Y-00027283
+X00048795Y-00027283
+X00049193Y-00024685
+X00049594Y-00025386
+X00049996Y-00024685
+X00050398Y-00025386
+X00050799Y-00024685
+X00051201Y-00025386
+X00051602Y-00024685
+X00052004Y-00025386
+X00052394Y-00027283
+X00053295Y-00027283
+M06
+T03
+X00029055Y-00026614
+X00030610Y-00032283
+X00031024Y-00027106
+X00032089Y-00026282
+X00034055Y-00029429
+X00034154Y-00032579
+X00035039Y-00038583
+X00035039Y-00039567
+X00035039Y-00040551
+X00035039Y-00041535
+X00035039Y-00042520
+X00035039Y-00043504
+X00035039Y-00044488
+X00035039Y-00045472
+X00035039Y-00046457
+X00035039Y-00047441
+X00035236Y-00024016
+X00036024Y-00057283
+X00037008Y-00050394
+X00037205Y-00027362
+X00037795Y-00051181
+X00038189Y-00050000
+X00038228Y-00029961
+X00038228Y-00030787
+X00038228Y-00031614
+X00038583Y-00051969
+X00038976Y-00050787
+X00039370Y-00025886
+X00039370Y-00049606
+X00039370Y-00052756
+X00039764Y-00051575
+X00039882Y-00030276
+X00039882Y-00031181
+X00040157Y-00023917
+X00040157Y-00050394
+X00040157Y-00053543
+X00040551Y-00052362
+X00040945Y-00051181
+X00041339Y-00053150
+X00041614Y-00030630
+X00041614Y-00031535
+X00041614Y-00032441
+X00041732Y-00051969
+X00042008Y-00033465
+X00042126Y-00050787
+X00042323Y-00029488
+X00042520Y-00052756
+X00042795Y-00027992
+X00042913Y-00051575
+X00043189Y-00025787
+X00043701Y-00052362
+X00044094Y-00051181
+X00044882Y-00051969
+X00045276Y-00033465
+X00045276Y-00053543
+X00045276Y-00054724
+X00045276Y-00055906
+X00045276Y-00057087
+X00045823Y-00035427
+X00046457Y-00037992
+X00046457Y-00038976
+X00046457Y-00040157
+X00046457Y-00041339
+X00046457Y-00053543
+X00046457Y-00054724
+X00046457Y-00055906
+X00046457Y-00057087
+X00047638Y-00037992
+X00047638Y-00038976
+X00047638Y-00040157
+X00047638Y-00041339
+X00047638Y-00053543
+X00047638Y-00054724
+X00047638Y-00055906
+X00047638Y-00057087
+X00048819Y-00037992
+X00048819Y-00038976
+X00048819Y-00040157
+X00048819Y-00041339
+X00048819Y-00053543
+X00048819Y-00057087
+X00050000Y-00037992
+X00050000Y-00041339
+X00050000Y-00053543
+X00050000Y-00057087
+X00051181Y-00037992
+X00051181Y-00041339
+X00051181Y-00042913
+X00051181Y-00051575
+X00051181Y-00053543
+X00051181Y-00057087
+X00052362Y-00042913
+X00052362Y-00046457
+X00052362Y-00048031
+X00052362Y-00051575
+X00052795Y-00034488
+X00053543Y-00042913
+X00053543Y-00042913
+X00053543Y-00042913
+X00053543Y-00044094
+X00053543Y-00045276
+X00053543Y-00046457
+X00053543Y-00048031
+X00053543Y-00049213
+X00053543Y-00050394
+X00053543Y-00051575
+X00054724Y-00042913
+X00054724Y-00044094
+X00054724Y-00045276
+X00054724Y-00046457
+X00054724Y-00048031
+X00054724Y-00049213
+X00054724Y-00050394
+X00054724Y-00051575
+X00054921Y-00035433
+X00055906Y-00042913
+X00055906Y-00044094
+X00055906Y-00045276
+X00055906Y-00046457
+X00055906Y-00048031
+X00055906Y-00049213
+X00055906Y-00050394
+X00055906Y-00051575
+X00042441Y-00022992
+X00042441Y-00024961
+X00045886Y-00023217
+X00045886Y-00024217
+X00045886Y-00025217
+X00045886Y-00026217
+X00037835Y-00022992
+X00037835Y-00024961
+X00029055Y-00029882
+X00031024Y-00029882
+X00029055Y-00034685
+X00031024Y-00034685
+M06
+T04
+X00033465Y-00023606
+X00033465Y-00024606
+X00061331Y-00030394
+X00062331Y-00030394
+X00063331Y-00030394
+X00064331Y-00030394
+M06
+T05
+X00029528Y-00049181
+X00029528Y-00051181
+X00029528Y-00053181
+X00064961Y-00049181
+X00064961Y-00051181
+X00064961Y-00053181
+X00029528Y-00041307
+X00029528Y-00043307
+X00029528Y-00045307
+X00064961Y-00041276
+X00064961Y-00043276
+X00064961Y-00045276
+M06
+T06
+X00055209Y-00025035
+X00061610Y-00025035
+X00047394Y-00025035
+X00053795Y-00025035
+M06
+T00
+M00
+