Add PCB interface

this incorporates some of @chintal's layers.py changes
PCB.from_directory() simplifies loading of multiple gerbers
the PCB() class should be pretty helpful going forward...

the context classes could use some cleaning up, although I'd like to wait until the freecad stuff gets merged, that way we can try to refactor the context base to support more use cases

3 files changed, 75 insertions, 40 deletions

diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py
index 8283ae0..7acf29a 100644
--- a/gerber/render/cairo_backend.py
+++ b/gerber/render/cairo_backend.py
@@ -17,7 +17,7 @@
 

 

 import cairocffi as cairo

-from operator import mul

+from operator import mul, div

 import math

 import tempfile

 

@@ -39,16 +39,16 @@ class GerberCairoContext(GerberContext):
         self.bg = False

         self.mask = None

         self.mask_ctx = None

-        self.origin_in_pixels = None

-        self.size_in_pixels = None

+        self.origin_in_inch = None

+        self.size_in_inch = None

 

-    def set_bounds(self, bounds):

+    def set_bounds(self, bounds, new_surface=False):

         origin_in_inch = (bounds[0][0], bounds[1][0])

         size_in_inch = (abs(bounds[0][1] - bounds[0][0]), abs(bounds[1][1] - bounds[1][0]))

         size_in_pixels = map(mul, size_in_inch, self.scale)

-        self.origin_in_pixels = tuple(map(mul, origin_in_inch, self.scale)) if self.origin_in_pixels is None else self.origin_in_pixels

-        self.size_in_pixels = size_in_pixels if self.size_in_pixels is None else self.size_in_pixels

-        if self.surface is None:

+        self.origin_in_inch = origin_in_inch if self.origin_in_inch is None else self.origin_in_inch

+        self.size_in_inch = size_in_inch if self.size_in_inch is None else self.size_in_inch

+        if (self.surface is None) or new_surface:

             self.surface_buffer = tempfile.NamedTemporaryFile()

             self.surface = cairo.SVGSurface(self.surface_buffer, size_in_pixels[0], size_in_pixels[1])

             self.ctx = cairo.Context(self.surface)

@@ -61,6 +61,36 @@ class GerberCairoContext(GerberContext):
             self.mask_ctx.scale(1, -1)

             self.mask_ctx.translate(-(origin_in_inch[0] * self.scale[0]), (-origin_in_inch[1]*self.scale[0]) - size_in_pixels[1])

 

+    def render_layers(self, layers, filename):

+        """ Render a set of layers

+        """

+        self.set_bounds(layers[0].bounds, True)

+        self._paint_background(True)

+        for layer in layers:

+            self._render_layer(layer)

+        self.dump(filename)

+

+    @property

+    def origin_in_pixels(self):

+        return tuple(map(mul, self.origin_in_inch, self.scale)) if self.origin_in_inch is not None else (0.0, 0.0)

+

+    @property

+    def size_in_pixels(self):

+        return tuple(map(mul, self.size_in_inch, self.scale)) if self.size_in_inch is not None else (0.0, 0.0)

+

+    def _render_layer(self, layer):

+        self.color = layer.settings.color

+        self.alpha = layer.settings.alpha

+        self.invert = layer.settings.invert

+        if layer.settings.mirror:

+            raise Warning('mirrored layers aren\'t supported yet...')

+        if self.invert:

+            self._clear_mask()

+        for p in layer.primitives:

+            self.render(p)

+        if self.invert:

+            self._render_mask()

+

     def _render_line(self, line, color):

         start = map(mul, line.start, self.scale)

         end = map(mul, line.end, self.scale)

@@ -178,12 +208,13 @@ class GerberCairoContext(GerberContext):
         self._render_circle(circle, color)

 

     def _render_test_record(self, primitive, color):

-        self.ctx.select_font_face('monospace', cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_NORMAL)

-        self.ctx.set_font_size(200)

-        self._render_circle(Circle(primitive.position, 0.01), color)

+        position = tuple(map(add, primitive.position, self.origin_in_inch))

+        self.ctx.select_font_face('monospace', cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)

+        self.ctx.set_font_size(13)

+        self._render_circle(Circle(position, 0.015), color)

         self.ctx.set_source_rgb(*color)

         self.ctx.set_operator(cairo.OPERATOR_OVER if primitive.level_polarity == "dark" else cairo.OPERATOR_CLEAR)

-        self.ctx.move_to(*[self.scale[0] * (coord + 0.01) for coord in primitive.position])

+        self.ctx.move_to(*[self.scale[0] * (coord + 0.015) for coord in position])

         self.ctx.scale(1, -1)

         self.ctx.show_text(primitive.net_name)

         self.ctx.scale(1, -1)

@@ -196,14 +227,15 @@ class GerberCairoContext(GerberContext):
     def _render_mask(self):

         self.ctx.set_operator(cairo.OPERATOR_OVER)

         ptn = cairo.SurfacePattern(self.mask)

-        ptn.set_matrix(cairo.Matrix(xx=1.0, yy=-1.0, x0=-self.origin_in_pixels[0], y0=self.size_in_pixels[1] + self.origin_in_pixels[1]))

+        ptn.set_matrix(cairo.Matrix(xx=1.0, yy=-1.0, x0=-self.origin_in_pixels[0],

+                                    y0=self.size_in_pixels[1] + self.origin_in_pixels[1]))

         self.ctx.set_source(ptn)

         self.ctx.paint()

 

-    def _paint_background(self):

-        if not self.bg:

+    def _paint_background(self, force=False):

+        if (not self.bg) or force:

             self.bg = True

-            self.ctx.set_source_rgba(*self.background_color)

+            self.ctx.set_source_rgba(*self.background_color, alpha=1.0)

             self.ctx.paint()

 

     def dump(self, filename):

diff --git a/gerber/render/render.py b/gerber/render/render.py
index 737061e..c76ead5 100644
--- a/gerber/render/render.py
+++ b/gerber/render/render.py
@@ -60,7 +60,6 @@ class GerberContext(object):
     def __init__(self, units='inch'):
         self._units = units
         self._color = (0.7215, 0.451, 0.200)
-        self._drill_color = (0.25, 0.25, 0.25)
         self._background_color = (0.0, 0.0, 0.0)
         self._alpha = 1.0
         self._invert = False
@@ -150,7 +149,7 @@ class GerberContext(object):
         elif isinstance(primitive, Polygon):
             self._render_polygon(primitive, color)
         elif isinstance(primitive, Drill):
-            self._render_drill(primitive, self.drill_color)
+            self._render_drill(primitive, color)
         elif isinstance(primitive, TestRecord):
             self._render_test_record(primitive, color)
         else:
@@ -185,15 +184,7 @@ class GerberContext(object):
 
 
 class Renderable(object):
-    def __init__(self, color=None, alpha=None, invert=False):
-        self.color = color
-        self.alpha = alpha
-        self.invert = invert
-
-    def to_render(self):
-        """ Override this in subclass. Should return a list of Primitives or Renderables
-        """
-        raise NotImplementedError('to_render() must be implemented in subclass')
-
-    def apply_theme(self, theme):
-        raise NotImplementedError('apply_theme() must be implemented in subclass')
+    def __init__(self, settings=None):
+        self.settings = settings
+        self.primitives = []
+
diff --git a/gerber/render/theme.py b/gerber/render/theme.py
index eae3735..5978831 100644
--- a/gerber/render/theme.py
+++ b/gerber/render/theme.py
@@ -19,6 +19,9 @@
 COLORS = {
     'black': (0.0, 0.0, 0.0),
     'white': (1.0, 1.0, 1.0),
+    'red': (1.0, 0.0, 0.0),
+    'green': (0.0, 1.0, 0.0),
+    'blue' : (0.0, 0.0, 1.0),
     'fr-4': (0.290, 0.345, 0.0),
     'green soldermask': (0.0, 0.612, 0.396),
     'blue soldermask': (0.059, 0.478, 0.651),
@@ -31,29 +34,38 @@ COLORS = {
 
 
 class RenderSettings(object):
-    def __init__(self, color, alpha=1.0, invert=False):
+    def __init__(self, color, alpha=1.0, invert=False, mirror=False):
         self.color = color
         self.alpha = alpha
-        self.invert = False
+        self.invert = invert
+        self.mirror = mirror
 
 
 class Theme(object):
-    def __init__(self, **kwargs):
-        self.background = kwargs.get('background', RenderSettings(COLORS['black'], 0.0))
+    def __init__(self, name=None, **kwargs):
+        self.name = 'Default' if name is None else name
+        self.background = kwargs.get('background', RenderSettings(COLORS['black'], alpha=0.0))
         self.topsilk = kwargs.get('topsilk', RenderSettings(COLORS['white']))
         self.bottomsilk = kwargs.get('bottomsilk', RenderSettings(COLORS['white']))
-        self.topmask = kwargs.get('topmask', RenderSettings(COLORS['green soldermask'], 0.8, True))
-        self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], 0.8, True))
+        self.topmask = kwargs.get('topmask', RenderSettings(COLORS['green soldermask'], alpha=0.8, invert=True))
+        self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], alpha=0.8, invert=True))
         self.top = kwargs.get('top', RenderSettings(COLORS['hasl copper']))
         self.bottom = kwargs.get('top', RenderSettings(COLORS['hasl copper']))
-        self.drill = kwargs.get('drill', self.background)
+        self.drill = kwargs.get('drill', RenderSettings(COLORS['black']))
+        self.ipc_netlist = kwargs.get('ipc_netlist', RenderSettings(COLORS['red']))
 
+    def __getitem__(self, key):
+        return getattr(self, key)
 
 THEMES = {
     'Default': Theme(),
-    'Osh Park': Theme(top=COLORS['enig copper'],
-                      bottom=COLORS['enig copper'],
-                      topmask=COLORS['purple soldermask'],
-                      bottommask=COLORS['purple soldermask']),
+    'OSH Park': Theme(name='OSH Park',
+                      top=RenderSettings(COLORS['enig copper']),
+                      bottom=RenderSettings(COLORS['enig copper']),
+                      topmask=RenderSettings(COLORS['purple soldermask'], alpha=0.8, invert=True),
+                      bottommask=RenderSettings(COLORS['purple soldermask'], alpha=0.8, invert=True)),
+    'Blue': Theme(name='Blue',
+                  topmask=RenderSettings(COLORS['blue soldermask'], alpha=0.8, invert=True),
+                  bottommask=RenderSettings(COLORS['blue soldermask'], alpha=0.8, invert=True)),
 }