summaryrefslogtreecommitdiff
path: root/gerber/gerber_statements.py
diff options
context:
space:
mode:
authorHamilton Kibbe <hamilton.kibbe@gmail.com>2015-02-09 17:39:24 -0500
committerHamilton Kibbe <hamilton.kibbe@gmail.com>2015-02-09 17:39:24 -0500
commit41f9475b132001d52064392057e376c6423c33dc (patch)
tree6e57eaea15312c8034739e477b34980d37b4d743 /gerber/gerber_statements.py
parentb0c55082b001a1232fb20bae25390a1514c9e8a9 (diff)
downloadgerbonara-41f9475b132001d52064392057e376c6423c33dc.tar.gz
gerbonara-41f9475b132001d52064392057e376c6423c33dc.tar.bz2
gerbonara-41f9475b132001d52064392057e376c6423c33dc.zip
Tests and bugfixes
Diffstat (limited to 'gerber/gerber_statements.py')
-rw-r--r--gerber/gerber_statements.py47
1 files changed, 31 insertions, 16 deletions
diff --git a/gerber/gerber_statements.py b/gerber/gerber_statements.py
index 48d5d93..1401345 100644
--- a/gerber/gerber_statements.py
+++ b/gerber/gerber_statements.py
@@ -262,19 +262,19 @@ class ADParamStmt(ParamStmt):
self.d = d
self.shape = shape
if modifiers is not None:
- self.modifiers = [[float(x) for x in m.split("X")] for m in modifiers.split(",") if len(m)]
+ self.modifiers = [tuple([float(x) for x in m.split("X")]) for m in modifiers.split(",") if len(m)]
else:
self.modifiers = []
def to_inch(self):
- self.modifiers = [[x / 25.4 for x in modifier] for modifier in self.modifiers]
+ self.modifiers = [tuple([x / 25.4 for x in modifier]) for modifier in self.modifiers]
def to_metric(self):
- self.modifiers = [[x * 25.4 for x in modifier] for modifier in self.modifiers]
+ self.modifiers = [tuple([x * 25.4 for x in modifier]) for modifier in self.modifiers]
def to_gerber(self, settings=None):
if len(self.modifiers):
- return '%ADD{0}{1},{2}*%'.format(self.d, self.shape, ','.join(['X'.join(["%.4f" % x for x in modifier]) for modifier in self.modifiers]))
+ return '%ADD{0}{1},{2}*%'.format(self.d, self.shape, ','.join(['X'.join(["%.4g" % x for x in modifier]) for modifier in self.modifiers]))
else:
return '%ADD{0}{1}*%'.format(self.d, self.shape)
@@ -326,16 +326,30 @@ class AMParamStmt(ParamStmt):
def _parsePrimitives(self, macro):
primitives = []
- for primitive in macro.split('*'):
+ for primitive in macro.strip('%\n').split('*'):
# Couldn't find anything explicit about leading whitespace in the spec...
- primitive = primitive.lstrip()
- if primitive[0] == '0':
- primitives.append(AMCommentPrimitive.from_gerber(primitive))
- if primitive[0] == '4':
- primitives.append(AMOutlinePrimitive.from_gerber(primitive))
- else:
- primitives.append(AMUnsupportPrimitive.from_gerber(primitive))
-
+ primitive = primitive.strip(' *%\n')
+ if len(primitive):
+ if primitive[0] == '0':
+ primitives.append(AMCommentPrimitive.from_gerber(primitive))
+ elif primitive[0] == '1':
+ primitives.append(AMCirclePrimitive.from_gerber(primitive))
+ elif primitive[0:2] in ('2,', '20'):
+ primitives.append(AMVectorLinePrimitive.from_gerber(primitive))
+ elif primitive[0:2] == '21':
+ primitives.append(AMCenterLinePrimitive.from_gerber(primitive))
+ elif primitive[0:2] == '22':
+ primitives.append(AMLowerLeftLinePrimitive.from_gerber(primitive))
+ elif primitive[0] == '4':
+ primitives.append(AMOutlinePrimitive.from_gerber(primitive))
+ elif primitive[0] == '5':
+ primitives.append(AMPolygonPrimitive.from_gerber(primitive))
+ elif primitive[0] =='6':
+ primitives.append(AMMoirePrimitive.from_gerber(primitive))
+ elif primitive[0] == '7':
+ primitives.append(AMThermalPrimitive.from_gerber(primitive))
+ else:
+ primitives.append(AMUnsupportPrimitive.from_gerber(primitive))
return primitives
def to_inch(self):
@@ -465,7 +479,8 @@ class IRParamStmt(ParamStmt):
"""
@classmethod
def from_dict(cls, stmt_dict):
- return cls(**stmt_dict)
+ angle = int(stmt_dict['angle'])
+ return cls(stmt_dict['param'], angle)
def __init__(self, param, angle):
""" Initialize IRParamStmt class
@@ -639,9 +654,9 @@ class SFParamStmt(ParamStmt):
def __str__(self):
scale_factor = ''
if self.a is not None:
- scale_factor += ('X: %f' % self.a)
+ scale_factor += ('X: %g' % self.a)
if self.b is not None:
- scale_factor += ('Y: %f' % self.b)
+ scale_factor += ('Y: %g' % self.b)
return ('<Scale Factor: %s>' % scale_factor)