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/render | |
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/render')
-rw-r--r-- | gerber/render/cairo_backend.py | 2 | ||||
-rw-r--r-- | gerber/render/rs274x_backend.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py index 349640a..dc39607 100644 --- a/gerber/render/cairo_backend.py +++ b/gerber/render/cairo_backend.py @@ -21,7 +21,7 @@ except ImportError: import cairocffi as cairo
import math
-from operator import mul, di
+from operator import mul, div
import tempfile
diff --git a/gerber/render/rs274x_backend.py b/gerber/render/rs274x_backend.py index 5ab74f0..b4b4612 100644 --- a/gerber/render/rs274x_backend.py +++ b/gerber/render/rs274x_backend.py @@ -476,6 +476,14 @@ class Rs274xContext(GerberContext): def _render_inverted_layer(self): pass + def _new_render_layer(self): + # TODO Might need to implement this + pass + + def _flatten(self): + # TODO Might need to implement this + pass + def dump(self): """Write the rendered file to a StringIO steam""" statements = map(lambda stmt: stmt.to_gerber(self.settings), self.statements) |