rusefi
/
gerbmerge
mirror of https://github.com/rusefi/gerbmerge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix aperture macro parsing for outline primitive 

RS-274X page 95 say that expected number of fields for an outline
primitive is 5 + 2N and not 3 + 2N which is what we were expecting.
This commit is contained in:
Paulo Henrique Silva 2016-01-18 21:13:37 +03:00 committed by olegart
parent ce31a9e9d3
commit 6599b96fe4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerbmerge/amacro.py
View File

@ -110,9 +110,10 @@ class ApertureMacroPrimitive:
# type 4 which is an outline and has a variable number of points.
# For outlines, the second parameter indicates the number of points,
# each of which has an (X,Y) co-ordinate. Thus, we expect an Outline
# specification to have 1+1+2*N+1=3+2N fields:
# specification to have 1+1+2+2*N+1=5+2N fields:
# - first field is exposure
# - second field is number of points
# - thrid and forth fields is for the initial point
# - 2*N fields for X,Y points
# - last field is rotation
if self.code==4:
@ -124,7 +125,7 @@ class ApertureMacroPrimitive:
except:
raise RuntimeError, 'Outline macro primitive has non-integer number of points'
if len(fields) != (3+2*N):
if len(fields) != (5+2*N):
raise RuntimeError, 'Outline macro primitive has %d fields...expecting %d fields' % (len(fields), 3+2*N)
else:
if len(fields) != len(valids):