Merge pull request #40 from curtacircuitos/cairo-render-unification

Cairo render unification

7 files changed, 141 insertions, 86 deletions

diff --git a/examples/cairo_example.png b/examples/cairo_example.png
index 723faaf..485586e 100644
--- a/examples/cairo_example.png
+++ b/examples/cairo_example.png
diff --git a/gerber/cam.py b/gerber/cam.py
index 23d8214..c567055 100644
--- a/gerber/cam.py
+++ b/gerber/cam.py
@@ -254,8 +254,11 @@ class CamFile(object):
         filename : string <optional>
             If provided, save the rendered image to `filename`
         """
-        bounds = [tuple([x * 1.2, y*1.2]) for x, y in self.bounds]
-        ctx.set_bounds(bounds)
+        ctx.set_bounds(self.bounds)
+        ctx._paint_background()
+        if ctx.invert:
+            ctx._paint_inverted_layer()
+
         for p in self.primitives:
             ctx.render(p)
         if filename is not None:
diff --git a/gerber/primitives.py b/gerber/primitives.py
index 00ecb12..0ac12af 100644
--- a/gerber/primitives.py
+++ b/gerber/primitives.py
@@ -63,7 +63,10 @@ class Primitive(object):
                 else:

                     try:

                         if len(value) > 1:

-                            if isinstance(value[0], tuple):

+                            if hasattr(value[0], 'to_inch'):

+                                for v in value:

+                                    v.to_inch()

+                            elif isinstance(value[0], tuple):

                                 setattr(self, attr, [tuple(map(inch, point)) for point in value])

                             else:

                                 setattr(self, attr, tuple(map(inch, value)))

@@ -81,7 +84,10 @@ class Primitive(object):
                 else:

                     try:

                         if len(value) > 1:

-                            if isinstance(value[0], tuple):

+                            if hasattr(value[0], 'to_metric'):

+                                for v in value:

+                                    v.to_metric()

+                            elif isinstance(value[0], tuple):

                                 setattr(self, attr, [tuple(map(metric, point)) for point in value])

                             else:

                                 setattr(self, attr, tuple(map(metric, value)))

@@ -584,23 +590,25 @@ class Polygon(Primitive):
 class Region(Primitive):

     """

     """

-    def __init__(self, points, **kwargs):

+    def __init__(self, primitives, **kwargs):

         super(Region, self).__init__(**kwargs)

-        self.points = points

-        self._to_convert = ['points']

+        self.primitives = primitives

+        self._to_convert = ['primitives']

 

     @property

     def bounding_box(self):

-        x_list, y_list = zip(*self.points)

-        min_x = min(x_list)

-        max_x = max(x_list)

-        min_y = min(y_list)

-        max_y = max(y_list)

+        xlims, ylims = zip(*[p.bounding_box for p in self.primitives])

+        minx, maxx = zip(*xlims)

+        miny, maxy = zip(*ylims)

+        min_x = min(minx)

+        max_x = max(maxx)

+        min_y = min(miny)

+        max_y = max(maxy)

         return ((min_x, max_x), (min_y, max_y))

 

     def offset(self, x_offset=0, y_offset=0):

-        self.points = [tuple(map(add, point, (x_offset, y_offset)))

-                       for point in self.points]

+        for p in self.primitives:

+            p.offset(x_offset, y_offset)

 

 

 class RoundButterfly(Primitive):

diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py
index fa1aecc..a97e552 100644
--- a/gerber/render/cairo_backend.py
+++ b/gerber/render/cairo_backend.py
@@ -16,53 +16,45 @@
 # limitations under the License.

 

 from .render import GerberContext

-from operator import mul

+

 import cairocffi as cairo

+

+from operator import mul

 import math

+import tempfile

 

 from ..primitives import *

 

-SCALE = 4000.

-

-

 class GerberCairoContext(GerberContext):

-    def __init__(self, surface=None, size=(10000, 10000)):

+    def __init__(self, scale=300):

         GerberContext.__init__(self)

-        if surface is None:

-            self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32,

-                                              size[0], size[1])

-        else:

-            self.surface = surface

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

-        self.size = size

-        self.ctx.translate(0, self.size[1])

-        self.scale = (SCALE,SCALE)

-        self.ctx.scale(1, -1)

-        self.apertures = {}

-        self.background = False

-

+        self.scale = (scale, scale)

+        self.surface = None

+        self.ctx = None

+        self.bg = False

+        

     def set_bounds(self, bounds):

-        if not self.background:

-            xbounds, ybounds = bounds

-            width = SCALE * (xbounds[1] - xbounds[0])

-            height = SCALE * (ybounds[1] - ybounds[0])

-            self.surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, int(width), int(height))

+        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)

+

+        if self.surface is None:

+            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)

-            self.ctx.translate(0, height)

-            self.scale = (SCALE,SCALE)

+            self.ctx.set_fill_rule(cairo.FILL_RULE_EVEN_ODD)

             self.ctx.scale(1, -1)

-            self.ctx.rectangle(SCALE * xbounds[0], SCALE * ybounds[0], width, height)

-            self.ctx.set_source_rgb(0,0,0)

-            self.ctx.fill()

-            self.background = True

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

+            # self.ctx.translate(-(origin_in_inch[0] * self.scale[0]), -origin_in_inch[1]*self.scale[1])

 

     def _render_line(self, line, color):

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

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

         if isinstance(line.aperture, Circle):

-            width = line.aperture.diameter if line.aperture.diameter != 0 else 0.001

+            width = line.aperture.diameter

             self.ctx.set_source_rgba(*color, alpha=self.alpha)

-            self.ctx.set_line_width(width * SCALE)

+            self.ctx.set_operator(cairo.OPERATOR_OVER if (line.level_polarity == "dark" and not self.invert) else cairo.OPERATOR_CLEAR)

+            self.ctx.set_line_width(width * self.scale[0])

             self.ctx.set_line_cap(cairo.LINE_CAP_ROUND)

             self.ctx.move_to(*start)

             self.ctx.line_to(*end)

@@ -70,6 +62,7 @@ class GerberCairoContext(GerberContext):
         elif isinstance(line.aperture, Rectangle):

             points = [tuple(map(mul, x, self.scale)) for x in line.vertices]

             self.ctx.set_source_rgba(*color, alpha=self.alpha)

+            self.ctx.set_operator(cairo.OPERATOR_OVER if (line.level_polarity == "dark" and not self.invert) else cairo.OPERATOR_CLEAR)

             self.ctx.set_line_width(0)

             self.ctx.move_to(*points[0])

             for point in points[1:]:

@@ -80,12 +73,13 @@ class GerberCairoContext(GerberContext):
         center = map(mul, arc.center, self.scale)

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

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

-        radius = SCALE * arc.radius

+        radius = self.scale[0] * arc.radius

         angle1 = arc.start_angle

         angle2 = arc.end_angle

         width = arc.aperture.diameter if arc.aperture.diameter != 0 else 0.001

         self.ctx.set_source_rgba(*color, alpha=self.alpha)

-        self.ctx.set_line_width(width * SCALE)

+        self.ctx.set_operator(cairo.OPERATOR_OVER if (arc.level_polarity == "dark" and not self.invert)else cairo.OPERATOR_CLEAR)        

+        self.ctx.set_line_width(width * self.scale[0])

         self.ctx.set_line_cap(cairo.LINE_CAP_ROUND)

         self.ctx.move_to(*start)  # You actually have to do this...

         if arc.direction == 'counterclockwise':

@@ -95,25 +89,40 @@ class GerberCairoContext(GerberContext):
         self.ctx.move_to(*end)  # ...lame

 

     def _render_region(self, region, color):

-        points = [tuple(map(mul, point, self.scale)) for point in region.points]

         self.ctx.set_source_rgba(*color, alpha=self.alpha)

+        self.ctx.set_operator(cairo.OPERATOR_OVER if (region.level_polarity == "dark" and not self.invert) else cairo.OPERATOR_CLEAR)

         self.ctx.set_line_width(0)

-        self.ctx.move_to(*points[0])

-        for point in points[1:]:

-            self.ctx.line_to(*point)

+        self.ctx.set_line_cap(cairo.LINE_CAP_ROUND)

+        self.ctx.move_to(*tuple(map(mul, region.primitives[0].start, self.scale)))

+        for p in region.primitives:

+            if isinstance(p, Line):

+                self.ctx.line_to(*tuple(map(mul, p.end, self.scale)))

+            else:

+                center = map(mul, p.center, self.scale)

+                start = map(mul, p.start, self.scale)

+                end = map(mul, p.end, self.scale)

+                radius = self.scale[0] * p.radius

+                angle1 = p.start_angle

+                angle2 = p.end_angle

+                if p.direction == 'counterclockwise':

+                    self.ctx.arc(*center, radius=radius, angle1=angle1, angle2=angle2)

+                else:

+                    self.ctx.arc_negative(*center, radius=radius, angle1=angle1, angle2=angle2)

         self.ctx.fill()

 

     def _render_circle(self, circle, color):

         center = tuple(map(mul, circle.position, self.scale))

         self.ctx.set_source_rgba(*color, alpha=self.alpha)

+        self.ctx.set_operator(cairo.OPERATOR_OVER if (circle.level_polarity == "dark" and not self.invert) else cairo.OPERATOR_CLEAR)        

         self.ctx.set_line_width(0)

-        self.ctx.arc(*center, radius=circle.radius * SCALE, angle1=0, angle2=2 * math.pi)

+        self.ctx.arc(*center, radius=circle.radius * self.scale[0], angle1=0, angle2=2 * math.pi)

         self.ctx.fill()

 

     def _render_rectangle(self, rectangle, color):

         ll = map(mul, rectangle.lower_left, self.scale)

         width, height = tuple(map(mul, (rectangle.width, rectangle.height), map(abs, self.scale)))

         self.ctx.set_source_rgba(*color, alpha=self.alpha)

+        self.ctx.set_operator(cairo.OPERATOR_OVER if (rectangle.level_polarity == "dark" and not self.invert) else cairo.OPERATOR_CLEAR)        

         self.ctx.set_line_width(0)

         self.ctx.rectangle(*ll,width=width, height=height)

         self.ctx.fill()

@@ -131,10 +140,35 @@ class GerberCairoContext(GerberContext):
         self.ctx.set_font_size(200)

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

         self.ctx.set_source_rgb(*color)

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

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

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

         self.ctx.scale(1, -1)

         self.ctx.show_text(primitive.net_name)

         self.ctx.scale(1, -1)

 

+    def _paint_inverted_layer(self):

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

+        self.ctx.set_operator(cairo.OPERATOR_OVER)

+        self.ctx.paint()

+        self.ctx.set_operator(cairo.OPERATOR_CLEAR)

+

+    def _paint_background(self):

+        if not self.bg:

+            self.bg = True

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

+            self.ctx.paint()

+

     def dump(self, filename):

-        self.surface.write_to_png(filename)

+        is_svg = filename.lower().endswith(".svg")

+

+        if is_svg:

+            self.surface.finish()

+            self.surface_buffer.flush()

+

+            with open(filename, "w") as f:

+                self.surface_buffer.seek(0)

+                f.write(self.surface_buffer.read())

+                f.flush()

+

+        else:

+            self.surface.write_to_png(filename)

diff --git a/gerber/render/render.py b/gerber/render/render.py
index 68c2115..124e743 100644
--- a/gerber/render/render.py
+++ b/gerber/render/render.py
@@ -62,6 +62,7 @@ class GerberContext(object):
         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
 
     @property
     def units(self):
@@ -122,6 +123,14 @@ class GerberContext(object):
             raise ValueError('Alpha must be between 0.0 and 1.0')
         self._alpha = alpha
 
+    @property
+    def invert(self):
+        return self._invert
+
+    @invert.setter
+    def invert(self, invert):
+        self._invert = invert
+
     def render(self, primitive):
         color = (self.color if primitive.level_polarity == 'dark'
                  else self.background_color)
diff --git a/gerber/rs274x.py b/gerber/rs274x.py
index b4963d1..1df3646 100644
--- a/gerber/rs274x.py
+++ b/gerber/rs274x.py
@@ -468,22 +468,29 @@ class GerberParser(object):
             stmt.op = self.op
 
         if self.op == "D01":
-            if self.region_mode == 'on':
-                if self.current_region is None:
-                    self.current_region = [(self.x, self.y), ]
-                self.current_region.append((x, y,))
-            else:
-                start = (self.x, self.y)
-                end = (x, y)
+            start = (self.x, self.y)
+            end = (x, y)
 
-                if self.interpolation == 'linear':
+            if self.interpolation == 'linear':
+                if self.region_mode == 'off':
                     self.primitives.append(Line(start, end, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units))
                 else:
-                    i = 0 if stmt.i is None else stmt.i
-                    j = 0 if stmt.j is None else stmt.j
-                    center = (start[0] + i, start[1] + j)
+                    if self.current_region is None:
+                        self.current_region = [Line(start, end, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units),]
+                    else:    
+                        self.current_region.append(Line(start, end, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units))
+            else:
+                i = 0 if stmt.i is None else stmt.i
+                j = 0 if stmt.j is None else stmt.j
+                center = (start[0] + i, start[1] + j)
+                if self.region_mode == 'off':
                     self.primitives.append(Arc(start, end, center, self.direction, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units))
-
+                else:
+                    if self.current_region is None:
+                        self.current_region = [Arc(start, end, center, self.direction, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units),]
+                    else:
+                        self.current_region.append(Arc(start, end, center, self.direction, self.apertures[self.aperture], level_polarity=self.level_polarity, units=self.settings.units))
+                                
         elif self.op == "D02":
             pass
 
diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py
index 67c7822..f8a32da 100644
--- a/gerber/tests/test_primitives.py
+++ b/gerber/tests/test_primitives.py
@@ -4,6 +4,7 @@
 # Author: Hamilton Kibbe <ham@hamiltonkib.be>
 from ..primitives import *
 from .tests import *
+from operator import add
 
 
 def test_primitive_smoketest():
@@ -766,38 +767,31 @@ def test_polygon_offset():
 def test_region_ctor():
     """ Test Region creation
     """
+    apt = Circle((0,0), 0)
+    lines = (Line((0,0), (1,0), apt), Line((1,0), (1,1), apt), Line((1,1), (0,1), apt), Line((0,1), (0,0), apt))
     points = ((0, 0), (1,0), (1,1), (0,1))
-    r = Region(points)
-    for i, point in enumerate(points):
-        assert_array_almost_equal(r.points[i], point)
+    r = Region(lines)
+    for i, p in enumerate(lines):
+        assert_equal(r.primitives[i], p)
 
 def test_region_bounds():
     """ Test region bounding box calculation
     """
-    points = ((0, 0), (1,0), (1,1), (0,1))
-    r = Region(points)
+    apt = Circle((0,0), 0)
+    lines = (Line((0,0), (1,0), apt), Line((1,0), (1,1), apt), Line((1,1), (0,1), apt), Line((0,1), (0,0), apt))
+    r = Region(lines)
     xbounds, ybounds = r.bounding_box
     assert_array_almost_equal(xbounds, (0, 1))
     assert_array_almost_equal(ybounds, (0, 1))
 
-def test_region_conversion():
-    points = ((2.54, 25.4), (254.0,2540.0), (25400.0,254000.0), (2.54,25.4))
-    r = Region(points, units='metric')
-    r.to_inch()
-    assert_equal(set(r.points), {(0.1, 1.0), (10.0, 100.0), (1000.0, 10000.0)})
-
-    points = ((0.1, 1.0), (10.0, 100.0), (1000.0, 10000.0), (0.1, 1.0))
-    r = Region(points, units='inch')
-    r.to_metric()
-    assert_equal(set(r.points), {(2.54, 25.4), (254.0, 2540.0), (25400.0, 254000.0)})
 
 def test_region_offset():
-    points = ((0, 0), (1,0), (1,1), (0,1))
-    r = Region(points)
-    r.offset(1, 0)
-    assert_equal(set(r.points), {(1, 0), (2, 0), (2,1), (1, 1)})
+    apt = Circle((0,0), 0)
+    lines = (Line((0,0), (1,0), apt), Line((1,0), (1,1), apt), Line((1,1), (0,1), apt), Line((0,1), (0,0), apt))
+    r = Region(lines)
+    xlim, ylim = r.bounding_box
     r.offset(0, 1)
-    assert_equal(set(r.points), {(1, 1), (2, 1), (2,2), (1, 2)})
+    assert_array_almost_equal((xlim, tuple([y+1 for y in ylim])), r.bounding_box)
 
 def test_round_butterfly_ctor():
     """ Test round butterfly creation