From 5476da8aa3f4ee424f56f4f2491e7af1c4b7b758 Mon Sep 17 00:00:00 2001
From: Hamilton Kibbe <hamilton.kibbe@gmail.com>
Date: Thu, 21 Jan 2016 03:57:44 -0500
Subject: Fix a bunch of rendering bugs.   - 'clear' polarity primitives no
 longer erase background   - Added aperture macro support for polygons   -
 Added aperture macro rendring support   - Renderer now creates a new surface
 for each layer and merges them instead of working     directly on a single
 surface   - Updated examples accordingly

---
 gerber/cam.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'gerber/cam.py')

diff --git a/gerber/cam.py b/gerber/cam.py
index 92ce83d..dda5c10 100644
--- a/gerber/cam.py
+++ b/gerber/cam.py
@@ -22,6 +22,7 @@ CAM File
 This module provides common base classes for Excellon/Gerber CNC files
 """
 
+
 class FileSettings(object):
     """ CAM File Settings
 
@@ -52,6 +53,7 @@ class FileSettings(object):
     specify both. `zero_suppression` will take on the opposite value of `zeros`
     and vice versa
     """
+
     def __init__(self, notation='absolute', units='inch',
                  zero_suppression=None, format=(2, 5), zeros=None,
                  angle_units='degrees'):
@@ -243,6 +245,12 @@ class CamFile(object):
         """
         pass
 
+    def to_inch(self):
+        pass
+
+    def to_metric(self):
+        pass
+
     def render(self, ctx, invert=False, filename=None):
         """ Generate image of layer.
 
@@ -256,15 +264,11 @@ class CamFile(object):
         """
         ctx.set_bounds(self.bounds)
         ctx._paint_background()
-
-        if invert:
-            ctx.invert = True
-            ctx._clear_mask()
+        ctx.invert = invert
+        ctx._new_render_layer()
         for p in self.primitives:
             ctx.render(p)
-        if invert:
-            ctx.invert = False
-            ctx._render_mask()
+        ctx._flatten()
 
         if filename is not None:
             ctx.dump(filename)
-- 
cgit 


From 5df38c014fd09792995b2b12b1982c535c962c9a Mon Sep 17 00:00:00 2001
From: Hamilton Kibbe <hamilton.kibbe@gmail.com>
Date: Thu, 28 Jan 2016 12:19:03 -0500
Subject: Cleanup, rendering fixes. fixed rendering of tented vias fixed
 rendering of semi-transparent layers fixed file type detection issues added
 some examples

---
 gerber/cam.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gerber/cam.py')

diff --git a/gerber/cam.py b/gerber/cam.py
index dda5c10..86312fb 100644
--- a/gerber/cam.py
+++ b/gerber/cam.py
@@ -251,7 +251,7 @@ class CamFile(object):
     def to_metric(self):
         pass
 
-    def render(self, ctx, invert=False, filename=None):
+    def render(self, ctx=None, invert=False, filename=None):
         """ Generate image of layer.
 
         Parameters
@@ -262,13 +262,16 @@ class CamFile(object):
         filename : string <optional>
             If provided, save the rendered image to `filename`
         """
+        if ctx is None:
+            from .render import GerberCairoContext
+            ctx = GerberCairoContext()
         ctx.set_bounds(self.bounds)
         ctx._paint_background()
         ctx.invert = invert
         ctx._new_render_layer()
         for p in self.primitives:
             ctx.render(p)
-        ctx._flatten()
+        ctx._paint()
 
         if filename is not None:
             ctx.dump(filename)
-- 
cgit