From 3fb26e6940b5ae752308d8a33f2608d266795153 Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Wed, 29 Dec 2021 19:58:20 +0100
Subject: Basic round-trip works

---
 gerbonara/gerber/aperture_macros/primitive.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'gerbonara/gerber/aperture_macros/primitive.py')

diff --git a/gerbonara/gerber/aperture_macros/primitive.py b/gerbonara/gerber/aperture_macros/primitive.py
index aeb38c4..4d3e597 100644
--- a/gerbonara/gerber/aperture_macros/primitive.py
+++ b/gerbonara/gerber/aperture_macros/primitive.py
@@ -7,9 +7,9 @@
 import contextlib
 import math
 
-from expression import Expression, UnitExpression, ConstantExpression, expr
+from .expression import Expression, UnitExpression, ConstantExpression, expr
 
-from .. import graphic_primitivese as gp
+from .. import graphic_primitives as gp
 
 
 def point_distance(a, b):
@@ -41,7 +41,7 @@ class Primitive:
                 raise ValueError(f'Too few arguments ({len(args)}) for aperture macro primitive {self.code} ({type(self)})')
 
     def to_gerber(self, unit=None):
-        return self.code + ',' + ','.join(
+        return f'{self.code},' + ','.join(
                 getattr(self, name).to_gerber(unit) for name in type(self).__annotations__) + '*'
 
     def __str__(self):
@@ -149,6 +149,7 @@ class Polygon(Primitive):
 
 class Thermal(Primitive):
     code = 7
+    exposure : Expression
     # center x/y
     x : UnitExpression
     y : UnitExpression
@@ -216,6 +217,8 @@ class Outline(Primitive):
 
 
 class Comment:
+    code = 0
+
     def __init__(self, comment):
         self.comment = comment
 
@@ -233,6 +236,6 @@ PRIMITIVE_CLASSES = {
         Thermal,
     ]},
     # alternative codes
-    2: VectorLinePrimitive,
+    2: VectorLine,
 }
 
-- 
cgit