diff options
| author | Garret Fick <garret@ficksworkshop.com> | 2016-08-06 09:51:58 +0800 |
|---|---|---|
| committer | Garret Fick <garret@ficksworkshop.com> | 2016-08-06 09:51:58 +0800 |
| commit | 8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410 (patch) | |
| tree | 8415fede2e664716a5b3a09fbb4c09baca78bcf8 /gerber/am_statements.py | |
| parent | 8cd842a41a55ab3d8f558a2e3e198beba7da58a1 (diff) | |
| download | gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.gz gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.tar.bz2 gerbonara-8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410.zip | |
Fix multiple problems with the merge. There are still errors, but I will intentionally leave them because future merges might resolve them
Diffstat (limited to 'gerber/am_statements.py')
| -rw-r--r-- | gerber/am_statements.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gerber/am_statements.py b/gerber/am_statements.py index 248542d..9c09085 100644 --- a/gerber/am_statements.py +++ b/gerber/am_statements.py @@ -1015,11 +1015,10 @@ class AMLowerLeftLinePrimitive(AMPrimitive): def to_primitive(self, units): # TODO I think I have merged this wrong # Offset the primitive from macro position - position = tuple([a + b for a , b in zip (position, self.lower_left)]) position = tuple([pos + offset for pos, offset in - zip(position, (self.width/2, self.height/2))]) + zip(self.lower_left, (self.width/2, self.height/2))]) # Return a renderable primitive - return Rectangle(self.position, self.width, self.height, + return Rectangle(position, self.width, self.height, level_polarity=self._level_polarity, units=units) def to_gerber(self, settings=None): |