Merge pull request #5 from hamiltonkibbe/merge-curtacircuitos
Merge curtacircuitos
This commit is contained in:
Garret Fick
GitHub
commit
1e868763a1
36 changed files with 1115 additions and 1012 deletions
4
Makefile
4
Makefile
|
|
@ -20,6 +20,10 @@ test-coverage:
|
|||
rm -rf coverage .coverage
|
||||
$(NOSETESTS) -s -v --with-coverage --cover-package=gerber
|
||||
|
||||
.PHONY: install
|
||||
install:
|
||||
PYTHONPATH=. $(PYTHON) setup.py install
|
||||
|
||||
.PHONY: doc-html
|
||||
doc-html:
|
||||
(cd $(DOC_ROOT); make html)
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -6,7 +6,7 @@ pcb-tools
|
|||
|
||||
Tools to handle Gerber and Excellon files in Python.
|
||||
|
||||
Useage Example:
|
||||
Usage Example:
|
||||
---------------
|
||||
import gerber
|
||||
from gerber.render import GerberCairoContext
|
||||
|
|
@ -27,10 +27,18 @@ Rendering Examples:
|
|||
-------------------
|
||||
###Top Composite rendering
|
||||
|
||||
|
||||
|
||||
Source code for this example can be found [here](examples/cairo_example.py).
|
||||
|
||||
|
||||
Install from source:
|
||||
```
|
||||
$ git clone https://github.com/curtacircuitos/pcb-tools.git
|
||||
$ cd pcb-tools
|
||||
$ python setup.py install
|
||||
```
|
||||
|
||||
Documentation:
|
||||
--------------
|
||||
[PCB Tools Documentation](http://pcb-tools.readthedocs.org/en/latest/)
|
||||
|
|
|
|||
BIN
examples/cairo_bottom.png
Normal file
BIN
examples/cairo_bottom.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 98 KiB |
|
|
@ -24,46 +24,54 @@ a .png file.
|
|||
"""
|
||||
|
||||
import os
|
||||
from gerber import read
|
||||
from gerber.render import GerberCairoContext, theme
|
||||
from gerber import load_layer
|
||||
from gerber.render import GerberCairoContext, RenderSettings, theme
|
||||
|
||||
GERBER_FOLDER = os.path.abspath(os.path.join(os.path.dirname(__file__), 'gerbers'))
|
||||
|
||||
|
||||
# Open the gerber files
|
||||
copper = read(os.path.join(GERBER_FOLDER, 'copper.GTL'))
|
||||
mask = read(os.path.join(GERBER_FOLDER, 'soldermask.GTS'))
|
||||
silk = read(os.path.join(GERBER_FOLDER, 'silkscreen.GTO'))
|
||||
drill = read(os.path.join(GERBER_FOLDER, 'ncdrill.DRD'))
|
||||
copper = load_layer(os.path.join(GERBER_FOLDER, 'copper.GTL'))
|
||||
mask = load_layer(os.path.join(GERBER_FOLDER, 'soldermask.GTS'))
|
||||
silk = load_layer(os.path.join(GERBER_FOLDER, 'silkscreen.GTO'))
|
||||
drill = load_layer(os.path.join(GERBER_FOLDER, 'ncdrill.DRD'))
|
||||
|
||||
# Create a new drawing context
|
||||
ctx = GerberCairoContext()
|
||||
|
||||
# Set opacity and color for copper layer
|
||||
ctx.alpha = 1.0
|
||||
ctx.color = theme.COLORS['hasl copper']
|
||||
|
||||
# Draw the copper layer
|
||||
copper.render(ctx)
|
||||
|
||||
# Set opacity and color for soldermask layer
|
||||
ctx.alpha = 0.75
|
||||
ctx.color = theme.COLORS['green soldermask']
|
||||
# Draw the copper layer. render_layer() uses the default color scheme for the
|
||||
# layer, based on the layer type. Copper layers are rendered as
|
||||
ctx.render_layer(copper)
|
||||
|
||||
# Draw the soldermask layer
|
||||
mask.render(ctx, invert=True)
|
||||
ctx.render_layer(mask)
|
||||
|
||||
# Set opacity and color for silkscreen layer
|
||||
ctx.alpha = 1.0
|
||||
ctx.color = theme.COLORS['white']
|
||||
|
||||
# Draw the silkscreen layer
|
||||
silk.render(ctx)
|
||||
# The default style can be overridden by passing a RenderSettings instance to
|
||||
# render_layer().
|
||||
# First, create a settings object:
|
||||
our_settings = RenderSettings(color=theme.COLORS['white'], alpha=0.85)
|
||||
|
||||
# Set opacity for drill layer
|
||||
ctx.alpha = 1.0
|
||||
ctx.color = theme.COLORS['black']
|
||||
drill.render(ctx)
|
||||
# Draw the silkscreen layer, and specify the rendering settings to use
|
||||
ctx.render_layer(silk, settings=our_settings)
|
||||
|
||||
# Draw the drill layer
|
||||
ctx.render_layer(drill)
|
||||
|
||||
# Write output to png file
|
||||
ctx.dump(os.path.join(os.path.dirname(__file__), 'cairo_example.png'))
|
||||
|
||||
# Load the bottom layers
|
||||
copper = load_layer(os.path.join(GERBER_FOLDER, 'bottom_copper.GBL'))
|
||||
mask = load_layer(os.path.join(GERBER_FOLDER, 'bottom_mask.GBS'))
|
||||
|
||||
# Clear the drawing
|
||||
ctx.clear()
|
||||
|
||||
# Render bottom layers
|
||||
ctx.render_layer(copper)
|
||||
ctx.render_layer(mask)
|
||||
ctx.render_layer(drill)
|
||||
|
||||
# Write png file
|
||||
ctx.dump(os.path.join(os.path.dirname(__file__), 'cairo_bottom.png'))
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 36 KiB |
|
|
@ -1,7 +1,7 @@
|
|||
#! /usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Copyright 2015 Hamilton Kibbe <ham@hamiltonkib.be>
|
||||
# Copyright 2016 Hamilton Kibbe <ham@hamiltonkib.be>
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -31,10 +31,22 @@ GERBER_FOLDER = os.path.abspath(os.path.join(os.path.dirname(__file__), 'gerbers
|
|||
# Create a new drawing context
|
||||
ctx = GerberCairoContext()
|
||||
|
||||
# Create a new PCB
|
||||
# Create a new PCB instance
|
||||
pcb = PCB.from_directory(GERBER_FOLDER)
|
||||
|
||||
# Render PCB
|
||||
ctx.render_layers(pcb.top_layers, os.path.join(os.path.dirname(__file__), 'pcb_top.png',), theme.THEMES['OSH Park'])
|
||||
ctx.render_layers(pcb.bottom_layers, os.path.join(os.path.dirname(__file__), 'pcb_bottom.png'), theme.THEMES['OSH Park'])
|
||||
# Render PCB top view
|
||||
ctx.render_layers(pcb.top_layers,
|
||||
os.path.join(os.path.dirname(__file__), 'pcb_top.png',),
|
||||
theme.THEMES['OSH Park'])
|
||||
|
||||
# Render PCB bottom view
|
||||
ctx.render_layers(pcb.bottom_layers,
|
||||
os.path.join(os.path.dirname(__file__), 'pcb_bottom.png'),
|
||||
theme.THEMES['OSH Park'])
|
||||
|
||||
# Render copper layers only
|
||||
ctx.render_layers(pcb.copper_layers + pcb.drill_layers,
|
||||
os.path.join(os.path.dirname(__file__),
|
||||
'pcb_transparent_copper.png'),
|
||||
theme.THEMES['Transparent Copper'])
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 96 KiB After Width: | Height: | Size: 90 KiB |
BIN
examples/pcb_transparent_copper.png
Normal file
BIN
examples/pcb_transparent_copper.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 83 KiB |
|
|
@ -24,4 +24,5 @@ files in python.
|
|||
"""
|
||||
|
||||
from .common import read, loads
|
||||
from .layers import load_layer, load_layer_data
|
||||
from .pcb import PCB
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ from math import asin
|
|||
import math
|
||||
|
||||
from .primitives import *
|
||||
from .primitives import Circle, Line, Outline, Polygon, Rectangle
|
||||
from .utils import validate_coordinates, inch, metric
|
||||
from .utils import validate_coordinates, inch, metric, rotate_point
|
||||
|
||||
|
||||
|
|
@ -75,7 +73,7 @@ class AMPrimitive(object):
|
|||
|
||||
def to_metric(self):
|
||||
raise NotImplementedError('Subclass must implement `to-metric`')
|
||||
|
||||
|
||||
@property
|
||||
def _level_polarity(self):
|
||||
if self.exposure == 'off':
|
||||
|
|
@ -190,9 +188,9 @@ class AMCirclePrimitive(AMPrimitive):
|
|||
diameter = float(modifiers[2])
|
||||
position = (float(modifiers[3]), float(modifiers[4]))
|
||||
return cls(code, exposure, diameter, position)
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_primitive(cls, primitive):
|
||||
def from_primitive(cls, primitive):
|
||||
return cls(1, 'on', primitive.diameter, primitive.position)
|
||||
|
||||
def __init__(self, code, exposure, diameter, position):
|
||||
|
|
@ -262,11 +260,11 @@ class AMVectorLinePrimitive(AMPrimitive):
|
|||
------
|
||||
ValueError, TypeError
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_primitive(cls, primitive):
|
||||
return cls(2, 'on', primitive.aperture.width, primitive.start, primitive.end, 0)
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_gerber(cls, primitive):
|
||||
modifiers = primitive.strip(' *').split(',')
|
||||
|
|
@ -310,27 +308,27 @@ class AMVectorLinePrimitive(AMPrimitive):
|
|||
endy=self.end[1],
|
||||
rotation=self.rotation)
|
||||
return fmtstr.format(**data)
|
||||
|
||||
|
||||
def to_primitive(self, units):
|
||||
"""
|
||||
Convert this to a primitive. We use the Outline to represent this (instead of Line)
|
||||
because the behaviour of the end caps is different for aperture macros compared to Lines
|
||||
when rotated.
|
||||
"""
|
||||
|
||||
|
||||
# Use a line to generate our vertices easily
|
||||
line = Line(self.start, self.end, Rectangle(None, self.width, self.width))
|
||||
vertices = line.vertices
|
||||
|
||||
|
||||
aperture = Circle((0, 0), 0)
|
||||
|
||||
|
||||
lines = []
|
||||
prev_point = rotate_point(vertices[-1], self.rotation, (0, 0))
|
||||
for point in vertices:
|
||||
cur_point = rotate_point(point, self.rotation, (0, 0))
|
||||
|
||||
|
||||
lines.append(Line(prev_point, cur_point, aperture))
|
||||
|
||||
|
||||
return Outline(lines, units=units, level_polarity=self._level_polarity)
|
||||
|
||||
|
||||
|
|
@ -372,19 +370,19 @@ class AMOutlinePrimitive(AMPrimitive):
|
|||
------
|
||||
ValueError, TypeError
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_primitive(cls, primitive):
|
||||
|
||||
|
||||
start_point = (round(primitive.primitives[0].start[0], 6), round(primitive.primitives[0].start[1], 6))
|
||||
points = []
|
||||
for prim in primitive.primitives:
|
||||
points.append((round(prim.end[0], 6), round(prim.end[1], 6)))
|
||||
|
||||
|
||||
rotation = 0.0
|
||||
|
||||
|
||||
return cls(4, 'on', start_point, points, rotation)
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_gerber(cls, primitive):
|
||||
modifiers = primitive.strip(' *').split(",")
|
||||
|
|
@ -432,27 +430,26 @@ class AMOutlinePrimitive(AMPrimitive):
|
|||
points=",\n".join(["%.6g,%.6g" % point for point in self.points]),
|
||||
rotation=str(self.rotation)
|
||||
)
|
||||
# TODO I removed a closing asterix - not sure if this works for items with multiple statements
|
||||
return "{code},{exposure},{n_points},{start_point},{points},\n{rotation}*".format(**data)
|
||||
|
||||
return "{code},{exposure},{n_points},{start_point},{points},{rotation}*".format(**data)
|
||||
|
||||
def to_primitive(self, units):
|
||||
"""
|
||||
Convert this to a drawable primitive. This uses the Outline instead of Line
|
||||
primitive to handle differences in end caps when rotated.
|
||||
"""
|
||||
|
||||
|
||||
lines = []
|
||||
prev_point = rotate_point(self.start_point, self.rotation)
|
||||
for point in self.points:
|
||||
cur_point = rotate_point(point, self.rotation)
|
||||
|
||||
|
||||
lines.append(Line(prev_point, cur_point, Circle((0,0), 0)))
|
||||
|
||||
|
||||
prev_point = cur_point
|
||||
|
||||
|
||||
if lines[0].start != lines[-1].end:
|
||||
raise ValueError('Outline must be closed')
|
||||
|
||||
|
||||
return Outline(lines, units=units, level_polarity=self._level_polarity)
|
||||
|
||||
|
||||
|
|
@ -495,11 +492,11 @@ class AMPolygonPrimitive(AMPrimitive):
|
|||
------
|
||||
ValueError, TypeError
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_primitive(cls, primitive):
|
||||
return cls(5, 'on', primitive.sides, primitive.position, primitive.diameter, primitive.rotation)
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_gerber(cls, primitive):
|
||||
modifiers = primitive.strip(' *').split(",")
|
||||
|
|
@ -548,7 +545,7 @@ class AMPolygonPrimitive(AMPrimitive):
|
|||
)
|
||||
fmt = "{code},{exposure},{vertices},{position},{diameter},{rotation}*"
|
||||
return fmt.format(**data)
|
||||
|
||||
|
||||
def to_primitive(self, units):
|
||||
return Polygon(self.position, self.vertices, self.diameter / 2.0, 0, rotation=math.radians(self.rotation), units=units, level_polarity=self._level_polarity)
|
||||
|
||||
|
|
@ -647,6 +644,7 @@ class AMMoirePrimitive(AMPrimitive):
|
|||
self.crosshair_thickness = metric(self.crosshair_thickness)
|
||||
self.crosshair_length = metric(self.crosshair_length)
|
||||
|
||||
|
||||
def to_gerber(self, settings=None):
|
||||
data = dict(
|
||||
code=self.code,
|
||||
|
|
@ -663,7 +661,8 @@ class AMMoirePrimitive(AMPrimitive):
|
|||
return fmt.format(**data)
|
||||
|
||||
def to_primitive(self, units):
|
||||
raise NotImplementedError()
|
||||
#raise NotImplementedError()
|
||||
return None
|
||||
|
||||
|
||||
class AMThermalPrimitive(AMPrimitive):
|
||||
|
|
@ -743,77 +742,77 @@ class AMThermalPrimitive(AMPrimitive):
|
|||
data = dict(
|
||||
code=self.code,
|
||||
position="%.4g,%.4g" % self.position,
|
||||
outer_diameter = self.outer_diameter,
|
||||
inner_diameter = self.inner_diameter,
|
||||
gap = self.gap,
|
||||
rotation = self.rotation
|
||||
outer_diameter=self.outer_diameter,
|
||||
inner_diameter=self.inner_diameter,
|
||||
gap=self.gap,
|
||||
rotation=self.rotation
|
||||
)
|
||||
fmt = "{code},{position},{outer_diameter},{inner_diameter},{gap},{rotation}*"
|
||||
return fmt.format(**data)
|
||||
|
||||
|
||||
def _approximate_arc_cw(self, start_angle, end_angle, radius, center):
|
||||
"""
|
||||
Get an arc as a series of points
|
||||
|
||||
|
||||
Parameters
|
||||
----------
|
||||
start_angle : The start angle in radians
|
||||
end_angle : The end angle in radians
|
||||
radius`: Radius of the arc
|
||||
center : The center point of the arc (x, y) tuple
|
||||
|
||||
|
||||
Returns
|
||||
-------
|
||||
array of point tuples
|
||||
"""
|
||||
|
||||
|
||||
# The total sweep
|
||||
sweep_angle = end_angle - start_angle
|
||||
num_steps = 10
|
||||
|
||||
|
||||
angle_step = sweep_angle / num_steps
|
||||
|
||||
|
||||
radius = radius
|
||||
center = center
|
||||
|
||||
|
||||
points = []
|
||||
|
||||
|
||||
for i in range(num_steps + 1):
|
||||
current_angle = start_angle + (angle_step * i)
|
||||
|
||||
|
||||
nextx = (center[0] + math.cos(current_angle) * radius)
|
||||
nexty = (center[1] + math.sin(current_angle) * radius)
|
||||
|
||||
|
||||
points.append((nextx, nexty))
|
||||
|
||||
|
||||
return points
|
||||
|
||||
def to_primitive(self, units):
|
||||
|
||||
|
||||
# We start with calculating the top right section, then duplicate it
|
||||
|
||||
|
||||
inner_radius = self.inner_diameter / 2.0
|
||||
outer_radius = self.outer_diameter / 2.0
|
||||
|
||||
|
||||
# Calculate the start angle relative to the horizontal axis
|
||||
inner_offset_angle = asin(self.gap / 2.0 / inner_radius)
|
||||
outer_offset_angle = asin(self.gap / 2.0 / outer_radius)
|
||||
|
||||
|
||||
rotation_rad = math.radians(self.rotation)
|
||||
inner_start_angle = inner_offset_angle + rotation_rad
|
||||
inner_end_angle = math.pi / 2 - inner_offset_angle + rotation_rad
|
||||
|
||||
|
||||
outer_start_angle = outer_offset_angle + rotation_rad
|
||||
outer_end_angle = math.pi / 2 - outer_offset_angle + rotation_rad
|
||||
|
||||
|
||||
outlines = []
|
||||
aperture = Circle((0, 0), 0)
|
||||
|
||||
|
||||
points = (self._approximate_arc_cw(inner_start_angle, inner_end_angle, inner_radius, self.position)
|
||||
+ list(reversed(self._approximate_arc_cw(outer_start_angle, outer_end_angle, outer_radius, self.position))))
|
||||
# Add in the last point since outlines should be closed
|
||||
points.append(points[0])
|
||||
|
||||
|
||||
# There are four outlines at rotated sections
|
||||
for rotation in [0, 90.0, 180.0, 270.0]:
|
||||
|
||||
|
|
@ -821,11 +820,11 @@ class AMThermalPrimitive(AMPrimitive):
|
|||
prev_point = rotate_point(points[0], rotation, self.position)
|
||||
for point in points[1:]:
|
||||
cur_point = rotate_point(point, rotation, self.position)
|
||||
|
||||
|
||||
lines.append(Line(prev_point, cur_point, aperture))
|
||||
|
||||
|
||||
prev_point = cur_point
|
||||
|
||||
|
||||
outlines.append(Outline(lines, units=units, level_polarity=self._level_polarity))
|
||||
|
||||
return outlines
|
||||
|
|
@ -869,7 +868,7 @@ class AMCenterLinePrimitive(AMPrimitive):
|
|||
------
|
||||
ValueError, TypeError
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_primitive(cls, primitive):
|
||||
width = primitive.width
|
||||
|
|
@ -912,9 +911,9 @@ class AMCenterLinePrimitive(AMPrimitive):
|
|||
def to_gerber(self, settings=None):
|
||||
data = dict(
|
||||
code=self.code,
|
||||
exposure='1' if self.exposure == 'on' else '0',
|
||||
width=self.width,
|
||||
height=self.height,
|
||||
exposure = '1' if self.exposure == 'on' else '0',
|
||||
width = self.width,
|
||||
height = self.height,
|
||||
center="%.4g,%.4g" % self.center,
|
||||
rotation=self.rotation
|
||||
)
|
||||
|
|
@ -922,27 +921,27 @@ class AMCenterLinePrimitive(AMPrimitive):
|
|||
return fmt.format(**data)
|
||||
|
||||
def to_primitive(self, units):
|
||||
|
||||
|
||||
x = self.center[0]
|
||||
y = self.center[1]
|
||||
half_width = self.width / 2.0
|
||||
half_height = self.height / 2.0
|
||||
|
||||
|
||||
points = []
|
||||
points.append((x - half_width, y + half_height))
|
||||
points.append((x - half_width, y - half_height))
|
||||
points.append((x + half_width, y - half_height))
|
||||
points.append((x + half_width, y + half_height))
|
||||
|
||||
|
||||
aperture = Circle((0, 0), 0)
|
||||
|
||||
|
||||
lines = []
|
||||
prev_point = rotate_point(points[3], self.rotation, self.center)
|
||||
for point in points:
|
||||
cur_point = rotate_point(point, self.rotation, self.center)
|
||||
|
||||
|
||||
lines.append(Line(prev_point, cur_point, aperture))
|
||||
|
||||
|
||||
return Outline(lines, units=units, level_polarity=self._level_polarity)
|
||||
|
||||
|
||||
|
|
@ -998,7 +997,7 @@ class AMLowerLeftLinePrimitive(AMPrimitive):
|
|||
def __init__(self, code, exposure, width, height, lower_left, rotation):
|
||||
if code != 22:
|
||||
raise ValueError('LowerLeftLinePrimitive code is 22')
|
||||
super(AMLowerLeftLinePrimitive, self).__init__(code, exposure)
|
||||
super (AMLowerLeftLinePrimitive, self).__init__(code, exposure)
|
||||
self.width = width
|
||||
self.height = height
|
||||
validate_coordinates(lower_left)
|
||||
|
|
@ -1015,21 +1014,12 @@ class AMLowerLeftLinePrimitive(AMPrimitive):
|
|||
self.width = metric(self.width)
|
||||
self.height = metric(self.height)
|
||||
|
||||
def to_primitive(self, units):
|
||||
# TODO I think I have merged this wrong
|
||||
# Offset the primitive from macro position
|
||||
position = tuple([pos + offset for pos, offset in
|
||||
zip(self.lower_left, (self.width/2, self.height/2))])
|
||||
# Return a renderable primitive
|
||||
return Rectangle(position, self.width, self.height,
|
||||
level_polarity=self._level_polarity, units=units)
|
||||
|
||||
def to_gerber(self, settings=None):
|
||||
data = dict(
|
||||
code=self.code,
|
||||
exposure='1' if self.exposure == 'on' else '0',
|
||||
width=self.width,
|
||||
height=self.height,
|
||||
exposure = '1' if self.exposure == 'on' else '0',
|
||||
width = self.width,
|
||||
height = self.height,
|
||||
lower_left="%.4g,%.4g" % self.lower_left,
|
||||
rotation=self.rotation
|
||||
)
|
||||
|
|
@ -1038,7 +1028,6 @@ class AMLowerLeftLinePrimitive(AMPrimitive):
|
|||
|
||||
|
||||
class AMUnsupportPrimitive(AMPrimitive):
|
||||
|
||||
@classmethod
|
||||
def from_gerber(cls, primitive):
|
||||
return cls(primitive)
|
||||
|
|
@ -1055,6 +1044,3 @@ class AMUnsupportPrimitive(AMPrimitive):
|
|||
|
||||
def to_gerber(self, settings=None):
|
||||
return self.primitive
|
||||
|
||||
def to_primitive(self, units):
|
||||
return None
|
||||
|
|
@ -168,7 +168,7 @@ class FileSettings(object):
|
|||
self.zero_suppression == other.zero_suppression and
|
||||
self.format == other.format and
|
||||
self.angle_units == other.angle_units)
|
||||
|
||||
|
||||
def __str__(self):
|
||||
return ('<Settings: %s %s %s %s %s>' %
|
||||
(self.units, self.notation, self.zero_suppression, self.format, self.angle_units))
|
||||
|
|
@ -256,7 +256,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
|
||||
|
|
@ -267,7 +267,10 @@ class CamFile(object):
|
|||
filename : string <optional>
|
||||
If provided, save the rendered image to `filename`
|
||||
"""
|
||||
ctx.set_bounds(self.bounds)
|
||||
if ctx is None:
|
||||
from .render import GerberCairoContext
|
||||
ctx = GerberCairoContext()
|
||||
ctx.set_bounds(self.bounding_box)
|
||||
ctx._paint_background()
|
||||
ctx.invert = invert
|
||||
ctx._new_render_layer()
|
||||
|
|
|
|||
|
|
@ -33,42 +33,39 @@ def read(filename):
|
|||
Returns
|
||||
-------
|
||||
file : CncFile subclass
|
||||
CncFile object representing the file, either GerberFile or
|
||||
ExcellonFile. Returns None if file is not an Excellon or Gerber file.
|
||||
CncFile object representing the file, either GerberFile, ExcellonFile,
|
||||
or IPCNetlist. Returns None if file is not of the proper type.
|
||||
"""
|
||||
with open(filename, 'rU') as f:
|
||||
data = f.read()
|
||||
fmt = detect_file_format(data)
|
||||
if fmt == 'rs274x':
|
||||
return rs274x.read(filename)
|
||||
elif fmt == 'excellon':
|
||||
return excellon.read(filename)
|
||||
elif fmt == 'ipc_d_356':
|
||||
return ipc356.read(filename)
|
||||
else:
|
||||
raise ParseError('Unable to detect file format')
|
||||
return loads(data, filename)
|
||||
|
||||
|
||||
def loads(data):
|
||||
def loads(data, filename=None):
|
||||
""" Read gerber or excellon file contents from a string and return a
|
||||
representative object.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
data : string
|
||||
gerber or excellon file contents as a string.
|
||||
Source file contents as a string.
|
||||
|
||||
filename : string, optional
|
||||
String containing the filename of the data source.
|
||||
|
||||
Returns
|
||||
-------
|
||||
file : CncFile subclass
|
||||
CncFile object representing the file, either GerberFile or
|
||||
ExcellonFile. Returns None if file is not an Excellon or Gerber file.
|
||||
CncFile object representing the data, either GerberFile, ExcellonFile,
|
||||
or IPCNetlist. Returns None if data is not of the proper type.
|
||||
"""
|
||||
|
||||
fmt = detect_file_format(data)
|
||||
if fmt == 'rs274x':
|
||||
return rs274x.loads(data)
|
||||
return rs274x.loads(data, filename=filename)
|
||||
elif fmt == 'excellon':
|
||||
return excellon.loads(data)
|
||||
return excellon.loads(data, filename=filename)
|
||||
elif fmt == 'ipc_d_356':
|
||||
return ipc356.loads(data, filename=filename)
|
||||
else:
|
||||
raise TypeError('Unable to detect file format')
|
||||
raise ParseError('Unable to detect file format')
|
||||
|
|
|
|||
|
|
@ -58,14 +58,17 @@ def read(filename):
|
|||
data = f.read()
|
||||
settings = FileSettings(**detect_excellon_format(data))
|
||||
return ExcellonParser(settings).parse(filename)
|
||||
|
||||
def loads(data, settings = None, tools = None):
|
||||
|
||||
def loads(data, filename=None, settings=None, tools=None):
|
||||
""" Read data from string and return an ExcellonFile
|
||||
Parameters
|
||||
----------
|
||||
data : string
|
||||
string containing Excellon file contents
|
||||
|
||||
|
||||
filename : string, optional
|
||||
string containing the filename of the data source
|
||||
|
||||
tools: dict (optional)
|
||||
externally defined tools
|
||||
|
||||
|
|
@ -78,55 +81,59 @@ def loads(data, settings = None, tools = None):
|
|||
# File object should use settings from source file by default.
|
||||
if not settings:
|
||||
settings = FileSettings(**detect_excellon_format(data))
|
||||
return ExcellonParser(settings, tools).parse_raw(data)
|
||||
return ExcellonParser(settings, tools).parse_raw(data, filename)
|
||||
|
||||
|
||||
class DrillHit(object):
|
||||
|
||||
class DrillHit(object):
|
||||
"""Drill feature that is a single drill hole.
|
||||
|
||||
|
||||
Attributes
|
||||
----------
|
||||
tool : ExcellonTool
|
||||
Tool to drill the hole. Defines the size of the hole that is generated.
|
||||
position : tuple(float, float)
|
||||
Center position of the drill.
|
||||
|
||||
"""
|
||||
|
||||
"""
|
||||
def __init__(self, tool, position):
|
||||
self.tool = tool
|
||||
self.position = position
|
||||
|
||||
def to_inch(self):
|
||||
self.position = tuple(map(inch, self.position))
|
||||
if self.tool.units == 'metric':
|
||||
self.tool.to_inch()
|
||||
self.position = tuple(map(inch, self.position))
|
||||
|
||||
def to_metric(self):
|
||||
self.position = tuple(map(metric, self.position))
|
||||
|
||||
if self.tool.units == 'inch':
|
||||
self.tool.to_metric()
|
||||
self.position = tuple(map(metric, self.position))
|
||||
|
||||
@property
|
||||
def bounding_box(self):
|
||||
position = self.position
|
||||
radius = self.tool.diameter / 2.
|
||||
|
||||
|
||||
min_x = position[0] - radius
|
||||
max_x = position[0] + radius
|
||||
min_y = position[1] - radius
|
||||
max_y = position[1] + radius
|
||||
return ((min_x, max_x), (min_y, max_y))
|
||||
|
||||
|
||||
def offset(self, x_offset, y_offset):
|
||||
self.position = tuple(map(operator.add, self.position, (x_offset, y_offset)))
|
||||
|
||||
|
||||
def __str__(self):
|
||||
return 'Hit (%f, %f) {%s}' % (self.position[0], self.position[1], self.tool)
|
||||
|
||||
|
||||
class DrillSlot(object):
|
||||
"""
|
||||
A slot is created between two points. The way the slot is created depends on the statement used to create it
|
||||
"""
|
||||
|
||||
|
||||
TYPE_ROUT = 1
|
||||
TYPE_G85 = 2
|
||||
|
||||
|
||||
def __init__(self, tool, start, end, slot_type):
|
||||
self.tool = tool
|
||||
self.start = start
|
||||
|
|
@ -134,13 +141,17 @@ class DrillSlot(object):
|
|||
self.slot_type = slot_type
|
||||
|
||||
def to_inch(self):
|
||||
self.start = tuple(map(inch, self.start))
|
||||
self.end = tuple(map(inch, self.end))
|
||||
if self.tool.units == 'metric':
|
||||
self.tool.to_inch()
|
||||
self.start = tuple(map(inch, self.start))
|
||||
self.end = tuple(map(inch, self.end))
|
||||
|
||||
def to_metric(self):
|
||||
self.start = tuple(map(metric, self.start))
|
||||
self.end = tuple(map(metric, self.end))
|
||||
|
||||
if self.tool.units == 'inch':
|
||||
self.tool.to_metric()
|
||||
self.start = tuple(map(metric, self.start))
|
||||
self.end = tuple(map(metric, self.end))
|
||||
|
||||
@property
|
||||
def bounding_box(self):
|
||||
start = self.start
|
||||
|
|
@ -151,7 +162,7 @@ class DrillSlot(object):
|
|||
min_y = min(start[1], end[1]) - radius
|
||||
max_y = max(start[1], end[1]) + radius
|
||||
return ((min_x, max_x), (min_y, max_y))
|
||||
|
||||
|
||||
def offset(self, x_offset, y_offset):
|
||||
self.start = tuple(map(operator.add, self.start, (x_offset, y_offset)))
|
||||
self.end = tuple(map(operator.add, self.end, (x_offset, y_offset)))
|
||||
|
|
@ -193,7 +204,7 @@ class ExcellonFile(CamFile):
|
|||
self.hits = hits
|
||||
|
||||
@property
|
||||
def primitives(self):
|
||||
def primitives(self):
|
||||
"""
|
||||
Gets the primitives. Note that unlike Gerber, this generates new objects
|
||||
"""
|
||||
|
|
@ -205,8 +216,8 @@ class ExcellonFile(CamFile):
|
|||
primitives.append(Slot(hit.start, hit.end, hit.tool.diameter, hit, units=self.settings.units))
|
||||
else:
|
||||
raise ValueError('Unknown hit type')
|
||||
|
||||
return primitives
|
||||
|
||||
return primitives
|
||||
|
||||
@property
|
||||
def bounds(self):
|
||||
|
|
@ -248,7 +259,9 @@ class ExcellonFile(CamFile):
|
|||
|
||||
def write(self, filename=None):
|
||||
filename = filename if filename is not None else self.filename
|
||||
with open(filename, 'w') as f:
|
||||
with open(filename, 'w') as f:
|
||||
|
||||
# Copy the header verbatim
|
||||
for statement in self.statements:
|
||||
if not isinstance(statement, ToolSelectionStmt):
|
||||
f.write(statement.to_excellon(self.settings) + '\n')
|
||||
|
|
@ -261,8 +274,8 @@ class ExcellonFile(CamFile):
|
|||
for hit in self.hits:
|
||||
if hit.tool.number == tool.number:
|
||||
f.write(CoordinateStmt(
|
||||
*hit.position).to_excellon(self.settings) + '\n')
|
||||
f.write(EndOfProgramStmt().to_excellon() + '\n')
|
||||
*hit.position).to_excellon(self.settings) + '\n')
|
||||
f.write(EndOfProgramStmt().to_excellon() + '\n')
|
||||
|
||||
def to_inch(self):
|
||||
"""
|
||||
|
|
@ -275,9 +288,9 @@ class ExcellonFile(CamFile):
|
|||
for tool in iter(self.tools.values()):
|
||||
tool.to_inch()
|
||||
for primitive in self.primitives:
|
||||
primitive.to_inch()
|
||||
for hit in self.hits:
|
||||
hit.to_inch()
|
||||
primitive.to_inch()
|
||||
for hit in self.hits:
|
||||
hit.to_inch()
|
||||
|
||||
def to_metric(self):
|
||||
""" Convert units to metric
|
||||
|
|
@ -297,9 +310,9 @@ class ExcellonFile(CamFile):
|
|||
for statement in self.statements:
|
||||
statement.offset(x_offset, y_offset)
|
||||
for primitive in self.primitives:
|
||||
primitive.offset(x_offset, y_offset)
|
||||
for hit in self. hits:
|
||||
hit.offset(x_offset, y_offset)
|
||||
primitive.offset(x_offset, y_offset)
|
||||
for hit in self. hits:
|
||||
hit.offset(x_offset, y_offset)
|
||||
|
||||
def path_length(self, tool_number=None):
|
||||
""" Return the path length for a given tool
|
||||
|
|
@ -309,8 +322,8 @@ class ExcellonFile(CamFile):
|
|||
for hit in self.hits:
|
||||
tool = hit.tool
|
||||
num = tool.number
|
||||
positions[num] = (0, 0) if positions.get(
|
||||
num) is None else positions[num]
|
||||
positions[num] = ((0, 0) if positions.get(num) is None
|
||||
else positions[num])
|
||||
lengths[num] = 0.0 if lengths.get(num) is None else lengths[num]
|
||||
lengths[num] = lengths[
|
||||
num] + math.hypot(*tuple(map(operator.sub, positions[num], hit.position)))
|
||||
|
|
@ -358,9 +371,9 @@ class ExcellonParser(object):
|
|||
Parameters
|
||||
----------
|
||||
settings : FileSettings or dict-like
|
||||
Excellon file settings to use when interpreting the excellon file.
|
||||
"""
|
||||
def __init__(self, settings=None, ext_tools=None):
|
||||
Excellon file settings to use when interpreting the excellon file.
|
||||
"""
|
||||
def __init__(self, settings=None, ext_tools=None):
|
||||
self.notation = 'absolute'
|
||||
self.units = 'inch'
|
||||
self.zeros = 'leading'
|
||||
|
|
@ -374,7 +387,7 @@ class ExcellonParser(object):
|
|||
self.active_tool = None
|
||||
self.pos = [0., 0.]
|
||||
self.drill_down = False
|
||||
# Default for lated is None, which means we don't know
|
||||
# Default for plated is None, which means we don't know
|
||||
self.plated = ExcellonTool.PLATED_UNKNOWN
|
||||
if settings is not None:
|
||||
self.units = settings.units
|
||||
|
|
@ -435,19 +448,19 @@ class ExcellonParser(object):
|
|||
[int(x) for x in comment_stmt.comment.split('=')[1].split(":")])
|
||||
if detected_format:
|
||||
self.format = detected_format
|
||||
|
||||
|
||||
if "TYPE=PLATED" in comment_stmt.comment:
|
||||
self.plated = ExcellonTool.PLATED_YES
|
||||
|
||||
|
||||
if "TYPE=NON_PLATED" in comment_stmt.comment:
|
||||
self.plated = ExcellonTool.PLATED_NO
|
||||
|
||||
|
||||
if "HEADER:" in comment_stmt.comment:
|
||||
self.state = "HEADER"
|
||||
|
||||
|
||||
if " Holesize " in comment_stmt.comment:
|
||||
self.state = "HEADER"
|
||||
|
||||
|
||||
# Parse this as a hole definition
|
||||
tools = ExcellonToolDefinitionParser(self._settings()).parse_raw(comment_stmt.comment)
|
||||
if len(tools) == 1:
|
||||
|
|
@ -464,12 +477,12 @@ class ExcellonParser(object):
|
|||
self.state = 'DRILL'
|
||||
elif self.state == 'INIT':
|
||||
self.state = 'HEADER'
|
||||
|
||||
|
||||
elif line[:3] == 'M00' and self.state == 'DRILL':
|
||||
if self.active_tool:
|
||||
cur_tool_number = self.active_tool.number
|
||||
next_tool = self._get_tool(cur_tool_number + 1)
|
||||
|
||||
|
||||
self.statements.append(NextToolSelectionStmt(self.active_tool, next_tool))
|
||||
self.active_tool = next_tool
|
||||
else:
|
||||
|
|
@ -523,7 +536,7 @@ class ExcellonParser(object):
|
|||
|
||||
stmt = CoordinateStmt.from_excellon(line[3:], self._settings())
|
||||
stmt.mode = self.state
|
||||
|
||||
|
||||
# The start position is where we were before the rout command
|
||||
start = (self.pos[0], self.pos[1])
|
||||
|
||||
|
|
@ -540,17 +553,17 @@ class ExcellonParser(object):
|
|||
self.pos[0] += x
|
||||
if y is not None:
|
||||
self.pos[1] += y
|
||||
|
||||
|
||||
# Our ending position
|
||||
end = (self.pos[0], self.pos[1])
|
||||
|
||||
|
||||
if self.drill_down:
|
||||
if not self.active_tool:
|
||||
self.active_tool = self._get_tool(1)
|
||||
|
||||
|
||||
self.hits.append(DrillSlot(self.active_tool, start, end, DrillSlot.TYPE_ROUT))
|
||||
self.active_tool._hit()
|
||||
|
||||
|
||||
elif line[:3] == 'G05':
|
||||
self.statements.append(DrillModeStmt())
|
||||
self.drill_down = False
|
||||
|
|
@ -613,12 +626,12 @@ class ExcellonParser(object):
|
|||
stmt = ToolSelectionStmt.from_excellon(line)
|
||||
self.statements.append(stmt)
|
||||
|
||||
# T0 is used as END marker, just ignore
|
||||
if stmt.tool != 0:
|
||||
# T0 is used as END marker, just ignore
|
||||
if stmt.tool != 0:
|
||||
tool = self._get_tool(stmt.tool)
|
||||
|
||||
|
||||
if not tool:
|
||||
# FIXME: for weird files with no tools defined, original calc from gerb
|
||||
# FIXME: for weird files with no tools defined, original calc from gerb
|
||||
if self._settings().units == "inch":
|
||||
diameter = (16 + 8 * stmt.tool) / 1000.0
|
||||
else:
|
||||
|
|
@ -649,13 +662,13 @@ class ExcellonParser(object):
|
|||
elif line[0] in ['X', 'Y']:
|
||||
if 'G85' in line:
|
||||
stmt = SlotStmt.from_excellon(line, self._settings())
|
||||
|
||||
|
||||
# I don't know if this is actually correct, but it makes sense that this is where the tool would end
|
||||
x = stmt.x_end
|
||||
y = stmt.y_end
|
||||
|
||||
|
||||
self.statements.append(stmt)
|
||||
|
||||
|
||||
if self.notation == 'absolute':
|
||||
if x is not None:
|
||||
self.pos[0] = x
|
||||
|
|
@ -666,19 +679,19 @@ class ExcellonParser(object):
|
|||
self.pos[0] += x
|
||||
if y is not None:
|
||||
self.pos[1] += y
|
||||
|
||||
|
||||
if self.state == 'DRILL' or self.state == 'HEADER':
|
||||
if not self.active_tool:
|
||||
self.active_tool = self._get_tool(1)
|
||||
|
||||
|
||||
self.hits.append(DrillSlot(self.active_tool, (stmt.x_start, stmt.y_start), (stmt.x_end, stmt.y_end), DrillSlot.TYPE_G85))
|
||||
self.active_tool._hit()
|
||||
else:
|
||||
stmt = CoordinateStmt.from_excellon(line, self._settings())
|
||||
|
||||
|
||||
# We need this in case we are in rout mode
|
||||
start = (self.pos[0], self.pos[1])
|
||||
|
||||
|
||||
x = stmt.x
|
||||
y = stmt.y
|
||||
self.statements.append(stmt)
|
||||
|
|
@ -692,71 +705,71 @@ class ExcellonParser(object):
|
|||
self.pos[0] += x
|
||||
if y is not None:
|
||||
self.pos[1] += y
|
||||
|
||||
|
||||
if self.state == 'LINEAR' and self.drill_down:
|
||||
if not self.active_tool:
|
||||
self.active_tool = self._get_tool(1)
|
||||
|
||||
|
||||
self.hits.append(DrillSlot(self.active_tool, start, tuple(self.pos), DrillSlot.TYPE_ROUT))
|
||||
|
||||
|
||||
elif self.state == 'DRILL' or self.state == 'HEADER':
|
||||
# Yes, drills in the header doesn't follow the specification, but it there are many
|
||||
# files like this
|
||||
if not self.active_tool:
|
||||
self.active_tool = self._get_tool(1)
|
||||
|
||||
|
||||
self.hits.append(DrillHit(self.active_tool, tuple(self.pos)))
|
||||
self.active_tool._hit()
|
||||
|
||||
|
||||
else:
|
||||
self.statements.append(UnknownStmt.from_excellon(line))
|
||||
|
||||
def _settings(self):
|
||||
return FileSettings(units=self.units, format=self.format,
|
||||
zeros=self.zeros, notation=self.notation)
|
||||
|
||||
|
||||
def _add_comment_tool(self, tool):
|
||||
"""
|
||||
Add a tool that was defined in the comments to this file.
|
||||
|
||||
|
||||
If we have already found this tool, then we will merge this comment tool definition into
|
||||
the information for the tool
|
||||
"""
|
||||
|
||||
|
||||
existing = self.tools.get(tool.number)
|
||||
if existing and existing.plated == None:
|
||||
existing.plated = tool.plated
|
||||
|
||||
|
||||
self.comment_tools[tool.number] = tool
|
||||
|
||||
|
||||
def _merge_properties(self, tool):
|
||||
"""
|
||||
When we have externally defined tools, merge the properties of that tool into this one
|
||||
|
||||
|
||||
For now, this is only plated
|
||||
"""
|
||||
|
||||
|
||||
if tool.plated == ExcellonTool.PLATED_UNKNOWN:
|
||||
ext_tool = self.ext_tools.get(tool.number)
|
||||
|
||||
|
||||
if ext_tool:
|
||||
tool.plated = ext_tool.plated
|
||||
|
||||
def _get_tool(self, toolid):
|
||||
|
||||
|
||||
tool = self.tools.get(toolid)
|
||||
if not tool:
|
||||
tool = self.comment_tools.get(toolid)
|
||||
if tool:
|
||||
tool.settings = self._settings()
|
||||
self.tools[toolid] = tool
|
||||
|
||||
|
||||
if not tool:
|
||||
tool = self.ext_tools.get(toolid)
|
||||
if tool:
|
||||
tool.settings = self._settings()
|
||||
self.tools[toolid] = tool
|
||||
|
||||
|
||||
return tool
|
||||
|
||||
def detect_excellon_format(data=None, filename=None):
|
||||
|
|
@ -821,8 +834,8 @@ def detect_excellon_format(data=None, filename=None):
|
|||
settings = FileSettings(zeros=zeros, format=fmt)
|
||||
try:
|
||||
p = ExcellonParser(settings)
|
||||
p.parse_raw(data)
|
||||
size = tuple([t[0] - t[1] for t in p.bounds])
|
||||
ef = p.parse_raw(data)
|
||||
size = tuple([t[0] - t[1] for t in ef.bounds])
|
||||
hole_area = 0.0
|
||||
for hit in p.hits:
|
||||
tool = hit.tool
|
||||
|
|
@ -862,9 +875,8 @@ def _layer_size_score(size, hole_count, hole_area):
|
|||
board_area = size[0] * size[1]
|
||||
if board_area == 0:
|
||||
return 0
|
||||
|
||||
|
||||
hole_percentage = hole_area / board_area
|
||||
hole_score = (hole_percentage - 0.25) ** 2
|
||||
size_score = (board_area - 8) ** 2
|
||||
return hole_score * size_score
|
||||
|
||||
|
|
@ -95,10 +95,10 @@ class ParamStmt(Statement):
|
|||
class FSParamStmt(ParamStmt):
|
||||
""" FS - Gerber Format Specification Statement
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_settings(cls, settings):
|
||||
|
||||
|
||||
return cls('FS', settings.zero_suppression, settings.notation, settings.format)
|
||||
|
||||
@classmethod
|
||||
|
|
@ -173,7 +173,7 @@ class FSParamStmt(ParamStmt):
|
|||
class MOParamStmt(ParamStmt):
|
||||
""" MO - Gerber Mode (measurement units) Statement.
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_units(cls, units):
|
||||
return cls(None, units)
|
||||
|
|
@ -235,7 +235,7 @@ class LPParamStmt(ParamStmt):
|
|||
param = stmt_dict['param']
|
||||
lp = 'clear' if stmt_dict.get('lp') == 'C' else 'dark'
|
||||
return cls(param, lp)
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_region(cls, region):
|
||||
#todo what is the first param?
|
||||
|
|
@ -272,34 +272,34 @@ class LPParamStmt(ParamStmt):
|
|||
class ADParamStmt(ParamStmt):
|
||||
""" AD - Gerber Aperture Definition Statement
|
||||
"""
|
||||
|
||||
|
||||
@classmethod
|
||||
def rect(cls, dcode, width, height):
|
||||
'''Create a rectangular aperture definition statement'''
|
||||
return cls('AD', dcode, 'R', ([width, height],))
|
||||
|
||||
|
||||
@classmethod
|
||||
def circle(cls, dcode, diameter, hole_diameter):
|
||||
'''Create a circular aperture definition statement'''
|
||||
|
||||
|
||||
if hole_diameter != None:
|
||||
return cls('AD', dcode, 'C', ([diameter, hole_diameter],))
|
||||
return cls('AD', dcode, 'C', ([diameter],))
|
||||
|
||||
|
||||
@classmethod
|
||||
def obround(cls, dcode, width, height):
|
||||
'''Create an obround aperture definition statement'''
|
||||
return cls('AD', dcode, 'O', ([width, height],))
|
||||
|
||||
|
||||
@classmethod
|
||||
def polygon(cls, dcode, diameter, num_vertices, rotation, hole_diameter):
|
||||
'''Create a polygon aperture definition statement'''
|
||||
return cls('AD', dcode, 'P', ([diameter, num_vertices, rotation, hole_diameter],))
|
||||
|
||||
|
||||
@classmethod
|
||||
def macro(cls, dcode, name):
|
||||
return cls('AD', dcode, name, '')
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, stmt_dict):
|
||||
param = stmt_dict.get('param')
|
||||
|
|
@ -435,8 +435,9 @@ class AMParamStmt(ParamStmt):
|
|||
self.primitives.append(
|
||||
AMThermalPrimitive.from_gerber(primitive))
|
||||
else:
|
||||
self.primitives.append(AMUnsupportPrimitive.from_gerber(primitive))
|
||||
|
||||
self.primitives.append(
|
||||
AMUnsupportPrimitive.from_gerber(primitive))
|
||||
|
||||
return AMGroup(self.primitives, stmt=self, units=self.units)
|
||||
|
||||
def to_inch(self):
|
||||
|
|
@ -864,10 +865,10 @@ class CoordStmt(Statement):
|
|||
""" Coordinate Data Block
|
||||
"""
|
||||
|
||||
OP_DRAW = 'D01'
|
||||
OP_DRAW = 'D01'
|
||||
OP_MOVE = 'D02'
|
||||
OP_FLASH = 'D03'
|
||||
|
||||
|
||||
FUNC_LINEAR = 'G01'
|
||||
FUNC_ARC_CW = 'G02'
|
||||
FUNC_ARC_CCW = 'G03'
|
||||
|
|
@ -894,26 +895,26 @@ class CoordStmt(Statement):
|
|||
j = parse_gerber_value(stmt_dict.get('j'), settings.format,
|
||||
settings.zero_suppression)
|
||||
return cls(function, x, y, i, j, op, settings)
|
||||
|
||||
|
||||
@classmethod
|
||||
def move(cls, func, point):
|
||||
if point:
|
||||
return cls(func, point[0], point[1], None, None, CoordStmt.OP_MOVE, None)
|
||||
# No point specified, so just write the function. This is normally for ending a region (D02*)
|
||||
return cls(func, None, None, None, None, CoordStmt.OP_MOVE, None)
|
||||
|
||||
|
||||
@classmethod
|
||||
def line(cls, func, point):
|
||||
return cls(func, point[0], point[1], None, None, CoordStmt.OP_DRAW, None)
|
||||
|
||||
|
||||
@classmethod
|
||||
def mode(cls, func):
|
||||
return cls(func, None, None, None, None, None, None)
|
||||
|
||||
|
||||
@classmethod
|
||||
def arc(cls, func, point, center):
|
||||
return cls(func, point[0], point[1], center[0], center[1], CoordStmt.OP_DRAW, None)
|
||||
|
||||
|
||||
@classmethod
|
||||
def flash(cls, point):
|
||||
if point:
|
||||
|
|
@ -1043,13 +1044,13 @@ class CoordStmt(Statement):
|
|||
coord_str += 'Op: %s' % op
|
||||
|
||||
return '<Coordinate Statement: %s>' % coord_str
|
||||
|
||||
|
||||
@property
|
||||
def only_function(self):
|
||||
"""
|
||||
Returns if the statement only set the function.
|
||||
"""
|
||||
|
||||
|
||||
# TODO I would like to refactor this so that the function is handled separately and then
|
||||
# TODO this isn't required
|
||||
return self.function != None and self.op == None and self.x == None and self.y == None and self.i == None and self.j == None
|
||||
|
|
@ -1104,11 +1105,11 @@ class EofStmt(Statement):
|
|||
|
||||
|
||||
class QuadrantModeStmt(Statement):
|
||||
|
||||
|
||||
@classmethod
|
||||
def single(cls):
|
||||
return cls('single-quadrant')
|
||||
|
||||
|
||||
@classmethod
|
||||
def multi(cls):
|
||||
return cls('multi-quadrant')
|
||||
|
|
@ -1140,11 +1141,11 @@ class RegionModeStmt(Statement):
|
|||
if 'G36' not in line and 'G37' not in line:
|
||||
raise ValueError('%s is not a valid region mode statement' % line)
|
||||
return (cls('on') if line[:3] == 'G36' else cls('off'))
|
||||
|
||||
|
||||
@classmethod
|
||||
def on(cls):
|
||||
return cls('on')
|
||||
|
||||
|
||||
@classmethod
|
||||
def off(cls):
|
||||
return cls('off')
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ _SM_FIELD = {
|
|||
|
||||
|
||||
def read(filename):
|
||||
""" Read data from filename and return an IPC_D_356
|
||||
""" Read data from filename and return an IPCNetlist
|
||||
Parameters
|
||||
----------
|
||||
filename : string
|
||||
|
|
@ -43,19 +43,38 @@ def read(filename):
|
|||
|
||||
Returns
|
||||
-------
|
||||
file : :class:`gerber.ipc356.IPC_D_356`
|
||||
An IPC_D_356 object created from the specified file.
|
||||
file : :class:`gerber.ipc356.IPCNetlist`
|
||||
An IPCNetlist object created from the specified file.
|
||||
|
||||
"""
|
||||
# File object should use settings from source file by default.
|
||||
return IPC_D_356.from_file(filename)
|
||||
return IPCNetlist.from_file(filename)
|
||||
|
||||
|
||||
class IPC_D_356(CamFile):
|
||||
def loads(data, filename=None):
|
||||
""" Generate an IPCNetlist object from IPC-D-356 data in memory
|
||||
|
||||
Parameters
|
||||
----------
|
||||
data : string
|
||||
string containing netlist file contents
|
||||
|
||||
filename : string, optional
|
||||
string containing the filename of the data source
|
||||
|
||||
Returns
|
||||
-------
|
||||
file : :class:`gerber.ipc356.IPCNetlist`
|
||||
An IPCNetlist created from the specified file.
|
||||
"""
|
||||
return IPCNetlistParser().parse_raw(data, filename)
|
||||
|
||||
|
||||
class IPCNetlist(CamFile):
|
||||
|
||||
@classmethod
|
||||
def from_file(cls, filename):
|
||||
parser = IPC_D_356_Parser()
|
||||
parser = IPCNetlistParser()
|
||||
return parser.parse(filename)
|
||||
|
||||
def __init__(self, statements, settings, primitives=None, filename=None):
|
||||
|
|
@ -130,7 +149,7 @@ class IPC_D_356(CamFile):
|
|||
ctx.dump(filename)
|
||||
|
||||
|
||||
class IPC_D_356_Parser(object):
|
||||
class IPCNetlistParser(object):
|
||||
# TODO: Allow multi-line statements (e.g. Altium board edge)
|
||||
|
||||
def __init__(self):
|
||||
|
|
@ -145,9 +164,13 @@ class IPC_D_356_Parser(object):
|
|||
|
||||
def parse(self, filename):
|
||||
with open(filename, 'rU') as f:
|
||||
oldline = ''
|
||||
for line in f:
|
||||
# Check for existing multiline data...
|
||||
data = f.read()
|
||||
return self.parse_raw(data, filename)
|
||||
|
||||
def parse_raw(self, data, filename=None):
|
||||
oldline = ''
|
||||
for line in data.splitlines():
|
||||
# Check for existing multiline data...
|
||||
if oldline != '':
|
||||
if len(line) and line[0] == '0':
|
||||
oldline = oldline.rstrip('\r\n') + line[3:].rstrip()
|
||||
|
|
@ -158,7 +181,7 @@ class IPC_D_356_Parser(object):
|
|||
oldline = line
|
||||
self._parse_line(oldline)
|
||||
|
||||
return IPC_D_356(self.statements, self.settings, filename=filename)
|
||||
return IPCNetlist(self.statements, self.settings, filename=filename)
|
||||
|
||||
def _parse_line(self, line):
|
||||
if not len(line):
|
||||
|
|
|
|||
|
|
@ -19,8 +19,9 @@ import os
|
|||
import re
|
||||
from collections import namedtuple
|
||||
|
||||
from . import common
|
||||
from .excellon import ExcellonFile
|
||||
from .ipc356 import IPC_D_356
|
||||
from .ipc356 import IPCNetlist
|
||||
|
||||
|
||||
Hint = namedtuple('Hint', 'layer ext name')
|
||||
|
|
@ -28,54 +29,66 @@ Hint = namedtuple('Hint', 'layer ext name')
|
|||
hints = [
|
||||
Hint(layer='top',
|
||||
ext=['gtl', 'cmp', 'top', ],
|
||||
name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ]
|
||||
name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ]
|
||||
),
|
||||
Hint(layer='bottom',
|
||||
ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ],
|
||||
name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ]
|
||||
name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ]
|
||||
),
|
||||
Hint(layer='internal',
|
||||
ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1',
|
||||
'g2', 'g3', 'g4', 'g5', 'g6', ],
|
||||
name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4',
|
||||
'gt5', 'gp6', 'gnd', 'ground', ]
|
||||
'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu']
|
||||
),
|
||||
Hint(layer='topsilk',
|
||||
ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ],
|
||||
name=['sst01', 'topsilk', 'silk', 'slk', 'sst', ]
|
||||
name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS']
|
||||
),
|
||||
Hint(layer='bottomsilk',
|
||||
ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', ],
|
||||
name=['bsilk', 'ssb', 'botsilk', ]
|
||||
ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk',],
|
||||
name=['bsilk', 'ssb', 'botsilk', 'B.SilkS']
|
||||
),
|
||||
Hint(layer='topmask',
|
||||
ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ],
|
||||
name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask',
|
||||
'mst', ]
|
||||
'mst', 'F.Mask',]
|
||||
),
|
||||
Hint(layer='bottommask',
|
||||
ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ],
|
||||
name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ]
|
||||
name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',]
|
||||
),
|
||||
Hint(layer='toppaste',
|
||||
ext=['gtp', 'tm', 'toppaste', ],
|
||||
name=['sp01', 'toppaste', 'pst']
|
||||
name=['sp01', 'toppaste', 'pst', 'F.Paste']
|
||||
),
|
||||
Hint(layer='bottompaste',
|
||||
ext=['gbp', 'bm', 'bottompaste', ],
|
||||
name=['sp02', 'botpaste', 'psb']
|
||||
name=['sp02', 'botpaste', 'psb', 'B.Paste', ]
|
||||
),
|
||||
Hint(layer='outline',
|
||||
ext=['gko', 'outline', ],
|
||||
name=['BDR', 'border', 'out', ]
|
||||
name=['BDR', 'border', 'out', 'Edge.Cuts', ]
|
||||
),
|
||||
Hint(layer='ipc_netlist',
|
||||
ext=['ipc'],
|
||||
name=[],
|
||||
),
|
||||
Hint(layer='drawing',
|
||||
ext=['fab'],
|
||||
name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing']
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
def load_layer(filename):
|
||||
return PCBLayer.from_cam(common.read(filename))
|
||||
|
||||
|
||||
def load_layer_data(data, filename=None):
|
||||
return PCBLayer.from_cam(common.loads(data, filename))
|
||||
|
||||
|
||||
def guess_layer_class(filename):
|
||||
try:
|
||||
directory, name = os.path.split(filename)
|
||||
|
|
@ -89,10 +102,12 @@ def guess_layer_class(filename):
|
|||
return 'unknown'
|
||||
|
||||
|
||||
def sort_layers(layers):
|
||||
def sort_layers(layers, from_top=True):
|
||||
layer_order = ['outline', 'toppaste', 'topsilk', 'topmask', 'top',
|
||||
'internal', 'bottom', 'bottommask', 'bottomsilk',
|
||||
'bottompaste', 'drill', ]
|
||||
'bottompaste']
|
||||
append_after = ['drill', 'drawing']
|
||||
|
||||
output = []
|
||||
drill_layers = [layer for layer in layers if layer.layer_class == 'drill']
|
||||
internal_layers = list(sorted([layer for layer in layers
|
||||
|
|
@ -107,6 +122,13 @@ def sort_layers(layers):
|
|||
for layer in layers:
|
||||
if layer.layer_class == layer_class:
|
||||
output.append(layer)
|
||||
if not from_top:
|
||||
output = list(reversed(output))
|
||||
|
||||
for layer_class in append_after:
|
||||
for layer in layers:
|
||||
if layer.layer_class == layer_class:
|
||||
output.append(layer)
|
||||
return output
|
||||
|
||||
|
||||
|
|
@ -126,14 +148,14 @@ class PCBLayer(object):
|
|||
|
||||
"""
|
||||
@classmethod
|
||||
def from_gerber(cls, camfile):
|
||||
def from_cam(cls, camfile):
|
||||
filename = camfile.filename
|
||||
layer_class = guess_layer_class(filename)
|
||||
if isinstance(camfile, ExcellonFile) or (layer_class == 'drill'):
|
||||
return DrillLayer.from_gerber(camfile)
|
||||
return DrillLayer.from_cam(camfile)
|
||||
elif layer_class == 'internal':
|
||||
return InternalLayer.from_gerber(camfile)
|
||||
if isinstance(camfile, IPC_D_356):
|
||||
return InternalLayer.from_cam(camfile)
|
||||
if isinstance(camfile, IPCNetlist):
|
||||
layer_class = 'ipc_netlist'
|
||||
return cls(filename, layer_class, camfile)
|
||||
|
||||
|
|
@ -155,9 +177,10 @@ class PCBLayer(object):
|
|||
def __repr__(self):
|
||||
return '<PCBLayer: {}>'.format(self.layer_class)
|
||||
|
||||
|
||||
class DrillLayer(PCBLayer):
|
||||
@classmethod
|
||||
def from_gerber(cls, camfile):
|
||||
def from_cam(cls, camfile):
|
||||
return cls(camfile.filename, camfile)
|
||||
|
||||
def __init__(self, filename=None, cam_source=None, layers=None, **kwargs):
|
||||
|
|
@ -168,11 +191,11 @@ class DrillLayer(PCBLayer):
|
|||
class InternalLayer(PCBLayer):
|
||||
|
||||
@classmethod
|
||||
def from_gerber(cls, camfile):
|
||||
def from_cam(cls, camfile):
|
||||
filename = camfile.filename
|
||||
try:
|
||||
order = int(re.search(r'\d+', filename).group())
|
||||
except:
|
||||
except AttributeError:
|
||||
order = 0
|
||||
return cls(filename, camfile, order)
|
||||
|
||||
|
|
@ -209,23 +232,3 @@ class InternalLayer(PCBLayer):
|
|||
if not hasattr(other, 'order'):
|
||||
raise TypeError()
|
||||
return (self.order <= other.order)
|
||||
|
||||
|
||||
class LayerSet(object):
|
||||
|
||||
def __init__(self, name, layers, **kwargs):
|
||||
super(LayerSet, self).__init__(**kwargs)
|
||||
self.name = name
|
||||
self.layers = list(layers)
|
||||
|
||||
def __len__(self):
|
||||
return len(self.layers)
|
||||
|
||||
def __getitem__(self, item):
|
||||
return self.layers[item]
|
||||
|
||||
def to_render(self):
|
||||
return self.layers
|
||||
|
||||
def apply_theme(self, theme):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
import os
|
||||
from .exceptions import ParseError
|
||||
from .layers import PCBLayer, LayerSet, sort_layers
|
||||
from .layers import PCBLayer, sort_layers
|
||||
from .common import read as gerber_read
|
||||
from .utils import listdir
|
||||
|
||||
|
|
@ -29,22 +29,26 @@ class PCB(object):
|
|||
def from_directory(cls, directory, board_name=None, verbose=False):
|
||||
layers = []
|
||||
names = set()
|
||||
|
||||
# Validate
|
||||
directory = os.path.abspath(directory)
|
||||
if not os.path.isdir(directory):
|
||||
raise TypeError('{} is not a directory.'.format(directory))
|
||||
|
||||
# Load gerber files
|
||||
for filename in listdir(directory, True, True):
|
||||
try:
|
||||
camfile = gerber_read(os.path.join(directory, filename))
|
||||
layer = PCBLayer.from_gerber(camfile)
|
||||
layer = PCBLayer.from_cam(camfile)
|
||||
layers.append(layer)
|
||||
names.add(os.path.splitext(filename)[0])
|
||||
if verbose:
|
||||
print('Added {} layer <{}>'.format(layer.layer_class, filename))
|
||||
print('[PCB]: Added {} layer <{}>'.format(layer.layer_class,
|
||||
filename))
|
||||
except ParseError:
|
||||
if verbose:
|
||||
print('Skipping file {}'.format(filename))
|
||||
print('[PCB]: Skipping file {}'.format(filename))
|
||||
|
||||
# Try to guess board name
|
||||
if board_name is None:
|
||||
if len(names) == 1:
|
||||
|
|
@ -66,14 +70,16 @@ class PCB(object):
|
|||
board_layers = [l for l in reversed(self.layers) if l.layer_class in
|
||||
('topsilk', 'topmask', 'top')]
|
||||
drill_layers = [l for l in self.drill_layers if 'top' in l.layers]
|
||||
return board_layers + drill_layers
|
||||
# Drill layer goes under soldermask for proper rendering of tented vias
|
||||
return [board_layers[0]] + drill_layers + board_layers[1:]
|
||||
|
||||
@property
|
||||
def bottom_layers(self):
|
||||
board_layers = [l for l in self.layers if l.layer_class in
|
||||
('bottomsilk', 'bottommask', 'bottom')]
|
||||
drill_layers = [l for l in self.drill_layers if 'bottom' in l.layers]
|
||||
return board_layers + drill_layers
|
||||
# Drill layer goes under soldermask for proper rendering of tented vias
|
||||
return [board_layers[0]] + drill_layers + board_layers[1:]
|
||||
|
||||
@property
|
||||
def drill_layers(self):
|
||||
|
|
@ -81,8 +87,9 @@ class PCB(object):
|
|||
|
||||
@property
|
||||
def copper_layers(self):
|
||||
return [layer for layer in self.layers if layer.layer_class in
|
||||
('top', 'bottom', 'internal')]
|
||||
return list(reversed([layer for layer in self.layers if
|
||||
layer.layer_class in
|
||||
('top', 'bottom', 'internal')]))
|
||||
|
||||
@property
|
||||
def layer_count(self):
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -25,3 +25,4 @@ SVG is the only supported format.
|
|||
|
||||
|
||||
from .cairo_backend import GerberCairoContext
|
||||
from .render import RenderSettings
|
||||
|
|
|
|||
|
|
@ -12,29 +12,25 @@
|
|||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
try:
|
||||
import cairo
|
||||
except ImportError:
|
||||
import cairocffi as cairo
|
||||
|
||||
import math
|
||||
from operator import mul, div
|
||||
|
||||
from operator import mul
|
||||
import tempfile
|
||||
import copy
|
||||
import os
|
||||
|
||||
import cairocffi as cairo
|
||||
|
||||
from ..primitives import *
|
||||
from .render import GerberContext, RenderSettings
|
||||
from .theme import THEMES
|
||||
from ..primitives import *
|
||||
|
||||
try:
|
||||
from cStringIO import StringIO
|
||||
except(ImportError):
|
||||
from io import StringIO
|
||||
from io import BytesIO
|
||||
|
||||
|
||||
class GerberCairoContext(GerberContext):
|
||||
|
|
@ -43,15 +39,16 @@ class GerberCairoContext(GerberContext):
|
|||
super(GerberCairoContext, self).__init__()
|
||||
self.scale = (scale, scale)
|
||||
self.surface = None
|
||||
self.surface_buffer = None
|
||||
self.ctx = None
|
||||
self.active_layer = None
|
||||
self.active_matrix = None
|
||||
self.output_ctx = None
|
||||
self.bg = False
|
||||
self.mask = None
|
||||
self.mask_ctx = None
|
||||
self.has_bg = False
|
||||
self.origin_in_inch = None
|
||||
self.size_in_inch = None
|
||||
self._xform_matrix = None
|
||||
self._render_count = 0
|
||||
|
||||
@property
|
||||
def origin_in_pixels(self):
|
||||
|
|
@ -72,10 +69,8 @@ class GerberCairoContext(GerberContext):
|
|||
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.surface = cairo.SVGSurface(self.surface_buffer, size_in_pixels[0], size_in_pixels[1])
|
||||
self.output_ctx = cairo.Context(self.surface)
|
||||
self.output_ctx.set_fill_rule(cairo.FILL_RULE_EVEN_ODD)
|
||||
self.output_ctx.scale(1, -1)
|
||||
self.output_ctx.translate(-(origin_in_inch[0] * self.scale[0]),
|
||||
(-origin_in_inch[1] * self.scale[0]) - size_in_pixels[1])
|
||||
|
|
@ -83,20 +78,48 @@ class GerberCairoContext(GerberContext):
|
|||
x0=-self.origin_in_pixels[0],
|
||||
y0=self.size_in_pixels[1] + self.origin_in_pixels[1])
|
||||
|
||||
def render_layers(self, layers, filename, theme=THEMES['default']):
|
||||
def render_layer(self, layer, filename=None, settings=None, bgsettings=None,
|
||||
verbose=False):
|
||||
if settings is None:
|
||||
settings = THEMES['default'].get(layer.layer_class, RenderSettings())
|
||||
if bgsettings is None:
|
||||
bgsettings = THEMES['default'].get('background', RenderSettings())
|
||||
|
||||
if self._render_count == 0:
|
||||
if verbose:
|
||||
print('[Render]: Rendering Background.')
|
||||
self.clear()
|
||||
self.set_bounds(layer.bounds)
|
||||
self._paint_background(bgsettings)
|
||||
if verbose:
|
||||
print('[Render]: Rendering {} Layer.'.format(layer.layer_class))
|
||||
self._render_count += 1
|
||||
self._render_layer(layer, settings)
|
||||
if filename is not None:
|
||||
self.dump(filename, verbose)
|
||||
|
||||
def render_layers(self, layers, filename, theme=THEMES['default'],
|
||||
verbose=False):
|
||||
""" Render a set of layers
|
||||
"""
|
||||
self.set_bounds(layers[0].bounds, True)
|
||||
self._paint_background(True)
|
||||
|
||||
self.clear()
|
||||
bgsettings = theme['background']
|
||||
for layer in layers:
|
||||
self._render_layer(layer, theme)
|
||||
self.dump(filename)
|
||||
settings = theme.get(layer.layer_class, RenderSettings())
|
||||
self.render_layer(layer, settings=settings, bgsettings=bgsettings,
|
||||
verbose=verbose)
|
||||
self.dump(filename, verbose)
|
||||
|
||||
def dump(self, filename):
|
||||
def dump(self, filename=None, verbose=False):
|
||||
""" Save image as `filename`
|
||||
"""
|
||||
if filename and filename.lower().endswith(".svg"):
|
||||
try:
|
||||
is_svg = os.path.splitext(filename.lower())[1] == '.svg'
|
||||
except:
|
||||
is_svg = False
|
||||
if verbose:
|
||||
print('[Render]: Writing image to {}'.format(filename))
|
||||
if is_svg:
|
||||
self.surface.finish()
|
||||
self.surface_buffer.flush()
|
||||
with open(filename, "w") as f:
|
||||
|
|
@ -107,9 +130,9 @@ class GerberCairoContext(GerberContext):
|
|||
return self.surface.write_to_png(filename)
|
||||
|
||||
def dump_str(self):
|
||||
""" Return a string containing the rendered image.
|
||||
""" Return a byte-string containing the rendered image.
|
||||
"""
|
||||
fobj = StringIO()
|
||||
fobj = BytesIO()
|
||||
self.surface.write_to_png(fobj)
|
||||
return fobj.getvalue()
|
||||
|
||||
|
|
@ -120,54 +143,40 @@ class GerberCairoContext(GerberContext):
|
|||
self.surface_buffer.flush()
|
||||
return self.surface_buffer.read()
|
||||
|
||||
def _render_layer(self, layer, theme=THEMES['default']):
|
||||
settings = theme.get(layer.layer_class, RenderSettings())
|
||||
self.color = settings.color
|
||||
self.alpha = settings.alpha
|
||||
self.invert = settings.invert
|
||||
def clear(self):
|
||||
self.surface = None
|
||||
self.output_ctx = None
|
||||
self.has_bg = False
|
||||
self.origin_in_inch = None
|
||||
self.size_in_inch = None
|
||||
self._xform_matrix = None
|
||||
self._render_count = 0
|
||||
if hasattr(self.surface_buffer, 'close'):
|
||||
self.surface_buffer.close()
|
||||
self.surface_buffer = None
|
||||
|
||||
def _render_layer(self, layer, settings):
|
||||
self.invert = settings.invert
|
||||
# Get a new clean layer to render on
|
||||
self._new_render_layer()
|
||||
if settings.mirror:
|
||||
raise Warning('mirrored layers aren\'t supported yet...')
|
||||
self._new_render_layer(mirror=settings.mirror)
|
||||
for prim in layer.primitives:
|
||||
self.render(prim)
|
||||
# Add layer to image
|
||||
self._flatten()
|
||||
self._flatten(settings.color, settings.alpha)
|
||||
|
||||
def _render_line(self, line, color):
|
||||
start = [pos * scale for pos, scale in zip(line.start, self.scale)]
|
||||
end = [pos * scale for pos, scale in zip(line.end, self.scale)]
|
||||
if not self.invert:
|
||||
<<<<<<< HEAD
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if line.level_polarity == "dark"
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
=======
|
||||
self.ctx.set_source_rgba(*color, alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if line.level_polarity == 'dark'
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if line.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
if isinstance(line.aperture, Circle):
|
||||
<<<<<<< HEAD
|
||||
width = line.aperture.diameter
|
||||
=======
|
||||
width = line.aperture.diameter
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
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)
|
||||
<<<<<<< HEAD
|
||||
self.ctx.stroke()
|
||||
=======
|
||||
self.ctx.stroke()
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
elif isinstance(line.aperture, Rectangle):
|
||||
points = [self.scale_point(x) for x in line.vertices]
|
||||
self.ctx.set_line_width(0)
|
||||
|
|
@ -190,61 +199,24 @@ class GerberCairoContext(GerberContext):
|
|||
width = arc.aperture.diameter if arc.aperture.diameter != 0 else 0.001
|
||||
else:
|
||||
width = max(arc.aperture.width, arc.aperture.height, 0.001)
|
||||
|
||||
if not self.invert:
|
||||
<<<<<<< HEAD
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if arc.level_polarity == "dark"\
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
=======
|
||||
self.ctx.set_source_rgba(*color, alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if arc.level_polarity == 'dark'
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
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':
|
||||
<<<<<<< HEAD
|
||||
self.ctx.arc(center[0], center[1], radius, angle1, angle2)
|
||||
else:
|
||||
self.ctx.arc_negative(center[0], center[1], radius, angle1, angle2)
|
||||
=======
|
||||
self.ctx.arc(*center, radius=radius, angle1=angle1, angle2=angle2)
|
||||
else:
|
||||
self.ctx.arc_negative(*center, radius=radius,
|
||||
angle1=angle1, angle2=angle2)
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
self.ctx.move_to(*end) # ...lame
|
||||
|
||||
def _render_region(self, region, color):
|
||||
if not self.invert:
|
||||
<<<<<<< HEAD
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if region.level_polarity == "dark"
|
||||
=======
|
||||
self.ctx.set_source_rgba(*color, alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if region.level_polarity == 'dark'
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if region.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.set_line_cap(cairo.LINE_CAP_ROUND)
|
||||
self.ctx.move_to(*self.scale_point(region.primitives[0].start))
|
||||
|
|
@ -262,71 +234,41 @@ class GerberCairoContext(GerberContext):
|
|||
else:
|
||||
self.ctx.arc_negative(*center, radius=radius,
|
||||
angle1=angle1, angle2=angle2)
|
||||
<<<<<<< HEAD
|
||||
self.ctx.fill()
|
||||
self.ctx.fill()
|
||||
|
||||
def _render_circle(self, circle, color):
|
||||
center = self.scale_point(circle.position)
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if circle.level_polarity == "dark"
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
if circle.hole_diameter > 0:
|
||||
self.ctx.push_group()
|
||||
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if circle.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.arc(center[0], center[1], radius=circle.radius * self.scale[0], 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()
|
||||
|
||||
|
||||
if circle.hole_diameter > 0:
|
||||
# Render the center clear
|
||||
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.arc(center[0], center[1], radius=circle.hole_radius * self.scale[0], angle1=0, angle2=2 * math.pi)
|
||||
self.ctx.fill()
|
||||
|
||||
self.ctx.pop_group_to_source()
|
||||
self.ctx.paint_with_alpha(1)
|
||||
=======
|
||||
self.ctx.fill()
|
||||
|
||||
def _render_circle(self, circle, color):
|
||||
center = self.scale_point(circle.position)
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(*color, alpha=self.alpha)
|
||||
self.ctx.set_operator(
|
||||
cairo.OPERATOR_OVER if circle.level_polarity == 'dark' else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.arc(*center, radius=circle.radius *
|
||||
self.scale[0], angle1=0, angle2=2 * math.pi)
|
||||
self.ctx.fill()
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
self.ctx.arc(center[0], center[1],
|
||||
radius=circle.hole_radius * self.scale[0], angle1=0,
|
||||
angle2=2 * math.pi)
|
||||
self.ctx.fill()
|
||||
|
||||
|
||||
def _render_rectangle(self, rectangle, color):
|
||||
lower_left = self.scale_point(rectangle.lower_left)
|
||||
width, height = tuple([abs(coord) for coord in self.scale_point((rectangle.width, rectangle.height))])
|
||||
<<<<<<< HEAD
|
||||
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER
|
||||
if rectangle.level_polarity == "dark"
|
||||
else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
width, height = tuple([abs(coord) for coord in
|
||||
self.scale_point((rectangle.width,
|
||||
rectangle.height))])
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if rectangle.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
|
||||
if rectangle.rotation != 0:
|
||||
self.ctx.save()
|
||||
|
||||
|
||||
center = map(mul, rectangle.position, self.scale)
|
||||
matrix = cairo.Matrix()
|
||||
matrix.translate(center[0], center[1])
|
||||
|
|
@ -335,128 +277,107 @@ class GerberCairoContext(GerberContext):
|
|||
lower_left[1] = lower_left[1] - center[1]
|
||||
matrix.rotate(rectangle.rotation)
|
||||
self.ctx.transform(matrix)
|
||||
|
||||
|
||||
if rectangle.hole_diameter > 0:
|
||||
self.ctx.push_group()
|
||||
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.rectangle(lower_left[0], lower_left[1], width, height)
|
||||
self.ctx.rectangle(*lower_left, width=width, height=height)
|
||||
self.ctx.fill()
|
||||
|
||||
|
||||
if rectangle.hole_diameter > 0:
|
||||
# Render the center clear
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR
|
||||
if rectangle.level_polarity == 'dark'
|
||||
and (not self.invert)
|
||||
else cairo.OPERATOR_SOURCE)
|
||||
center = map(mul, rectangle.position, self.scale)
|
||||
self.ctx.arc(center[0], center[1], radius=rectangle.hole_radius * self.scale[0], angle1=0, angle2=2 * math.pi)
|
||||
self.ctx.arc(center[0], center[1],
|
||||
radius=rectangle.hole_radius * self.scale[0], angle1=0,
|
||||
angle2=2 * math.pi)
|
||||
self.ctx.fill()
|
||||
|
||||
self.ctx.pop_group_to_source()
|
||||
self.ctx.paint_with_alpha(1)
|
||||
|
||||
if rectangle.rotation != 0:
|
||||
self.ctx.restore()
|
||||
=======
|
||||
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(*color, alpha=self.alpha)
|
||||
self.ctx.set_operator(
|
||||
cairo.OPERATOR_OVER if rectangle.level_polarity == 'dark' else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.rectangle(*lower_left, width=width, height=height)
|
||||
self.ctx.fill()
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
if rectangle.rotation != 0:
|
||||
self.ctx.restore()
|
||||
|
||||
def _render_obround(self, obround, color):
|
||||
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER if obround.level_polarity == "dark" else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
if obround.hole_diameter > 0:
|
||||
self.ctx.push_group()
|
||||
|
||||
self._render_circle(obround.subshapes['circle1'], color)
|
||||
self._render_circle(obround.subshapes['circle2'], color)
|
||||
self._render_rectangle(obround.subshapes['rectangle'], color)
|
||||
|
||||
|
||||
if obround.hole_diameter > 0:
|
||||
# Render the center clear
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
center = map(mul, obround.position, self.scale)
|
||||
self.ctx.arc(center[0], center[1], radius=obround.hole_radius * self.scale[0], angle1=0, angle2=2 * math.pi)
|
||||
self.ctx.arc(center[0], center[1],
|
||||
radius=obround.hole_radius * self.scale[0], angle1=0,
|
||||
angle2=2 * math.pi)
|
||||
self.ctx.fill()
|
||||
|
||||
|
||||
self.ctx.pop_group_to_source()
|
||||
self.ctx.paint_with_alpha(1)
|
||||
|
||||
|
||||
def _render_polygon(self, polygon, color):
|
||||
|
||||
|
||||
# TODO Ths does not handle rotation of a polygon
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER if polygon.level_polarity == "dark" else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if polygon.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
if polygon.hole_radius > 0:
|
||||
self.ctx.push_group()
|
||||
|
||||
vertices = polygon.vertices
|
||||
|
||||
vertices = polygon.vertices
|
||||
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.set_line_cap(cairo.LINE_CAP_ROUND)
|
||||
|
||||
|
||||
# Start from before the end so it is easy to iterate and make sure it is closed
|
||||
self.ctx.move_to(*map(mul, vertices[-1], self.scale))
|
||||
for v in vertices:
|
||||
self.ctx.line_to(*map(mul, v, self.scale))
|
||||
|
||||
self.ctx.fill()
|
||||
|
||||
|
||||
if polygon.hole_radius > 0:
|
||||
# Render the center clear
|
||||
center = tuple(map(mul, polygon.position, self.scale))
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR
|
||||
if polygon.level_polarity == 'dark'
|
||||
and (not self.invert)
|
||||
else cairo.OPERATOR_SOURCE)
|
||||
self.ctx.set_line_width(0)
|
||||
self.ctx.arc(center[0], center[1], polygon.hole_radius * self.scale[0], 0, 2 * math.pi)
|
||||
self.ctx.arc(center[0],
|
||||
center[1],
|
||||
polygon.hole_radius * self.scale[0], 0, 2 * math.pi)
|
||||
self.ctx.fill()
|
||||
|
||||
self.ctx.pop_group_to_source()
|
||||
self.ctx.paint_with_alpha(1)
|
||||
|
||||
def _render_drill(self, circle, color=None):
|
||||
color = color if color is not None else self.drill_color
|
||||
self._render_circle(circle, color)
|
||||
|
||||
|
||||
def _render_slot(self, slot, color):
|
||||
start = map(mul, slot.start, self.scale)
|
||||
end = map(mul, slot.end, self.scale)
|
||||
|
||||
|
||||
width = slot.diameter
|
||||
|
||||
if not self.invert:
|
||||
self.ctx.set_source_rgba(color[0], color[1], color[2], alpha=self.alpha)
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER if slot.level_polarity == "dark" else cairo.OPERATOR_CLEAR)
|
||||
else:
|
||||
self.ctx.set_source_rgba(0.0, 0.0, 0.0, 1.0)
|
||||
self.ctx.set_operator(cairo.OPERATOR_CLEAR)
|
||||
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if slot.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)
|
||||
self.ctx.stroke()
|
||||
|
||||
|
||||
def _render_amgroup(self, amgroup, color):
|
||||
self.ctx.push_group()
|
||||
for primitive in amgroup.primitives:
|
||||
|
|
@ -465,64 +386,56 @@ class GerberCairoContext(GerberContext):
|
|||
self.ctx.paint_with_alpha(1)
|
||||
|
||||
def _render_test_record(self, primitive, color):
|
||||
position = [pos + origin for pos, origin in zip(primitive.position, self.origin_in_inch)]
|
||||
self.ctx.set_operator(cairo.OPERATOR_OVER)
|
||||
position = [pos + origin for pos, origin in
|
||||
zip(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_rgba(*color, alpha=self.alpha)
|
||||
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.015)
|
||||
for coord in position])
|
||||
self.ctx.set_operator(cairo.OPERATOR_SOURCE
|
||||
if primitive.level_polarity == 'dark' and
|
||||
(not self.invert) else cairo.OPERATOR_CLEAR)
|
||||
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)
|
||||
self.ctx.scale(1, -1)
|
||||
|
||||
def _new_render_layer(self, color=None):
|
||||
def _new_render_layer(self, color=None, mirror=False):
|
||||
size_in_pixels = self.scale_point(self.size_in_inch)
|
||||
matrix = copy.copy(self._xform_matrix)
|
||||
layer = cairo.SVGSurface(None, size_in_pixels[0], size_in_pixels[1])
|
||||
ctx = cairo.Context(layer)
|
||||
ctx.set_fill_rule(cairo.FILL_RULE_EVEN_ODD)
|
||||
ctx.scale(1, -1)
|
||||
ctx.translate(-(self.origin_in_inch[0] * self.scale[0]),
|
||||
(-self.origin_in_inch[1] * self.scale[0])
|
||||
- size_in_pixels[1])
|
||||
(-self.origin_in_inch[1] * self.scale[0]) - size_in_pixels[1])
|
||||
if self.invert:
|
||||
ctx.set_operator(cairo.OPERATOR_OVER)
|
||||
ctx.set_source_rgba(*self.color, alpha=self.alpha)
|
||||
ctx.paint()
|
||||
if mirror:
|
||||
matrix.xx = -1.0
|
||||
matrix.x0 = self.origin_in_pixels[0] + self.size_in_pixels[0]
|
||||
self.ctx = ctx
|
||||
self.active_layer = layer
|
||||
self.active_matrix = matrix
|
||||
|
||||
def _flatten(self):
|
||||
self.output_ctx.set_operator(cairo.OPERATOR_OVER)
|
||||
<<<<<<< HEAD
|
||||
ptn = cairo.SurfacePattern(self.active_layer)
|
||||
=======
|
||||
def _flatten(self, color=None, alpha=None):
|
||||
color = color if color is not None else self.color
|
||||
alpha = alpha if alpha is not None else self.alpha
|
||||
ptn = cairo.SurfacePattern(self.active_layer)
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
ptn.set_matrix(self._xform_matrix)
|
||||
self.output_ctx.set_source(ptn)
|
||||
self.output_ctx.paint()
|
||||
ptn.set_matrix(self.active_matrix)
|
||||
self.output_ctx.set_source_rgba(*color, alpha=alpha)
|
||||
self.output_ctx.mask(ptn)
|
||||
self.ctx = None
|
||||
self.active_layer = None
|
||||
self.active_matrix = None
|
||||
|
||||
def _paint_background(self, force=False):
|
||||
if (not self.bg) or force:
|
||||
self.bg = True
|
||||
self.output_ctx.set_operator(cairo.OPERATOR_OVER)
|
||||
<<<<<<< HEAD
|
||||
self.output_ctx.set_source_rgba(self.background_color[0], self.background_color[1], self.background_color[2], alpha=1.0)
|
||||
def _paint_background(self, settings=None):
|
||||
color = settings.color if settings is not None else self.background_color
|
||||
alpha = settings.alpha if settings is not None else 1.0
|
||||
if not self.has_bg:
|
||||
self.has_bg = True
|
||||
self.output_ctx.set_source_rgba(*color, alpha=alpha)
|
||||
self.output_ctx.paint()
|
||||
|
||||
def scale_point(self, point):
|
||||
return tuple([coord * scale for coord, scale in zip(point, self.scale)])
|
||||
=======
|
||||
self.output_ctx.set_source_rgba(*self.background_color, alpha=1.0)
|
||||
self.output_ctx.paint()
|
||||
|
||||
def scale_point(self, point):
|
||||
return tuple([coord * scale for coord, scale in zip(point, self.scale)])
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ class GerberContext(object):
|
|||
Measurement units. 'inch' or 'metric'
|
||||
|
||||
color : tuple (<float>, <float>, <float>)
|
||||
Color used for rendering as a tuple of normalized (red, green, blue) values.
|
||||
Color used for rendering as a tuple of normalized (red, green, blue)
|
||||
values.
|
||||
|
||||
drill_color : tuple (<float>, <float>, <float>)
|
||||
Color used for rendering drill hits. Format is the same as for `color`.
|
||||
|
|
@ -62,6 +63,7 @@ class GerberContext(object):
|
|||
self._units = units
|
||||
self._color = (0.7215, 0.451, 0.200)
|
||||
self._background_color = (0.0, 0.0, 0.0)
|
||||
self._drill_color = (0.0, 0.0, 0.0)
|
||||
self._alpha = 1.0
|
||||
self._invert = False
|
||||
self.ctx = None
|
||||
|
|
@ -136,9 +138,9 @@ class GerberContext(object):
|
|||
def render(self, primitive):
|
||||
if not primitive:
|
||||
return
|
||||
|
||||
|
||||
self._pre_render_primitive(primitive)
|
||||
|
||||
|
||||
color = self.color
|
||||
if isinstance(primitive, Line):
|
||||
self._render_line(primitive, color)
|
||||
|
|
@ -164,16 +166,16 @@ class GerberContext(object):
|
|||
self._render_region(primitive, color)
|
||||
elif isinstance(primitive, TestRecord):
|
||||
self._render_test_record(primitive, color)
|
||||
|
||||
|
||||
self._post_render_primitive(primitive)
|
||||
|
||||
|
||||
def _pre_render_primitive(self, primitive):
|
||||
"""
|
||||
Called before rendering a primitive. Use the callback to perform some action before rendering
|
||||
a primitive, for example adding a comment.
|
||||
"""
|
||||
return
|
||||
|
||||
|
||||
def _post_render_primitive(self, primitive):
|
||||
"""
|
||||
Called after rendering a primitive. Use the callback to perform some action after rendering
|
||||
|
|
@ -182,7 +184,6 @@ class GerberContext(object):
|
|||
return
|
||||
|
||||
|
||||
|
||||
def _render_line(self, primitive, color):
|
||||
pass
|
||||
|
||||
|
|
@ -206,10 +207,10 @@ class GerberContext(object):
|
|||
|
||||
def _render_drill(self, primitive, color):
|
||||
pass
|
||||
|
||||
|
||||
def _render_slot(self, primitive, color):
|
||||
pass
|
||||
|
||||
|
||||
def _render_amgroup(self, primitive, color):
|
||||
pass
|
||||
|
||||
|
|
@ -218,8 +219,8 @@ class GerberContext(object):
|
|||
|
||||
|
||||
class RenderSettings(object):
|
||||
|
||||
def __init__(self, color=(0.0, 0.0, 0.0), alpha=1.0, invert=False, mirror=False):
|
||||
def __init__(self, color=(0.0, 0.0, 0.0), alpha=1.0, invert=False,
|
||||
mirror=False):
|
||||
self.color = color
|
||||
self.alpha = alpha
|
||||
self.invert = invert
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ try:
|
|||
from cStringIO import StringIO
|
||||
except(ImportError):
|
||||
from io import StringIO
|
||||
|
||||
|
||||
from .render import GerberContext
|
||||
from ..am_statements import *
|
||||
from ..gerber_statements import *
|
||||
|
|
@ -15,27 +15,27 @@ from ..primitives import AMGroup, Arc, Circle, Line, Obround, Outline, Polygon,
|
|||
|
||||
class AMGroupContext(object):
|
||||
'''A special renderer to generate aperature macros from an AMGroup'''
|
||||
|
||||
|
||||
def __init__(self):
|
||||
self.statements = []
|
||||
|
||||
|
||||
def render(self, amgroup, name):
|
||||
|
||||
|
||||
if amgroup.stmt:
|
||||
# We know the statement it was generated from, so use that to create the AMParamStmt
|
||||
# It will give a much better result
|
||||
|
||||
|
||||
stmt = deepcopy(amgroup.stmt)
|
||||
stmt.name = name
|
||||
|
||||
|
||||
return stmt
|
||||
|
||||
|
||||
else:
|
||||
# Clone ourselves, then offset by the psotion so that
|
||||
# our render doesn't have to consider offset. Just makes things simpler
|
||||
nooffset_group = deepcopy(amgroup)
|
||||
nooffset_group.position = (0, 0)
|
||||
|
||||
|
||||
# Now draw the shapes
|
||||
for primitive in nooffset_group.primitives:
|
||||
if isinstance(primitive, Outline):
|
||||
|
|
@ -50,46 +50,46 @@ class AMGroupContext(object):
|
|||
self._render_polygon(primitive)
|
||||
else:
|
||||
raise ValueError('amgroup')
|
||||
|
||||
|
||||
statement = AMParamStmt('AM', name, self._statements_to_string())
|
||||
return statement
|
||||
|
||||
|
||||
def _statements_to_string(self):
|
||||
macro = ''
|
||||
|
||||
for statement in self.statements:
|
||||
macro += statement.to_gerber()
|
||||
|
||||
|
||||
return macro
|
||||
|
||||
|
||||
def _render_circle(self, circle):
|
||||
self.statements.append(AMCirclePrimitive.from_primitive(circle))
|
||||
|
||||
|
||||
def _render_rectangle(self, rectangle):
|
||||
self.statements.append(AMCenterLinePrimitive.from_primitive(rectangle))
|
||||
|
||||
|
||||
def _render_line(self, line):
|
||||
self.statements.append(AMVectorLinePrimitive.from_primitive(line))
|
||||
|
||||
|
||||
def _render_outline(self, outline):
|
||||
self.statements.append(AMOutlinePrimitive.from_primitive(outline))
|
||||
|
||||
|
||||
def _render_polygon(self, polygon):
|
||||
self.statements.append(AMPolygonPrimitive.from_primitive(polygon))
|
||||
|
||||
|
||||
def _render_thermal(self, thermal):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
class Rs274xContext(GerberContext):
|
||||
|
||||
|
||||
def __init__(self, settings):
|
||||
GerberContext.__init__(self)
|
||||
self.comments = []
|
||||
self.header = []
|
||||
self.body = []
|
||||
self.end = [EofStmt()]
|
||||
|
||||
|
||||
# Current values so we know if we have to execute
|
||||
# moves, levey changes before anything else
|
||||
self._level_polarity = None
|
||||
|
|
@ -97,65 +97,65 @@ class Rs274xContext(GerberContext):
|
|||
self._func = None
|
||||
self._quadrant_mode = None
|
||||
self._dcode = None
|
||||
|
||||
|
||||
# Primarily for testing and comarison to files, should we write
|
||||
# flashes as a single statement or a move plus flash? Set to true
|
||||
# to do in a single statement. Normally this can be false
|
||||
self.condensed_flash = True
|
||||
|
||||
|
||||
# When closing a region, force a D02 staement to close a region.
|
||||
# This is normally not necessary because regions are closed with a G37
|
||||
# staement, but this will add an extra statement for doubly close
|
||||
# the region
|
||||
self.explicit_region_move_end = False
|
||||
|
||||
|
||||
self._next_dcode = 10
|
||||
self._rects = {}
|
||||
self._circles = {}
|
||||
self._obrounds = {}
|
||||
self._polygons = {}
|
||||
self._macros = {}
|
||||
|
||||
|
||||
self._i_none = 0
|
||||
self._j_none = 0
|
||||
|
||||
|
||||
self.settings = settings
|
||||
|
||||
self._start_header(settings)
|
||||
|
||||
|
||||
def _start_header(self, settings):
|
||||
self.header.append(FSParamStmt.from_settings(settings))
|
||||
self.header.append(MOParamStmt.from_units(settings.units))
|
||||
|
||||
|
||||
def _simplify_point(self, point):
|
||||
return (point[0] if point[0] != self._pos[0] else None, point[1] if point[1] != self._pos[1] else None)
|
||||
|
||||
|
||||
def _simplify_offset(self, point, offset):
|
||||
|
||||
|
||||
if point[0] != offset[0]:
|
||||
xoffset = point[0] - offset[0]
|
||||
else:
|
||||
xoffset = self._i_none
|
||||
|
||||
|
||||
if point[1] != offset[1]:
|
||||
yoffset = point[1] - offset[1]
|
||||
else:
|
||||
yoffset = self._j_none
|
||||
|
||||
|
||||
return (xoffset, yoffset)
|
||||
|
||||
|
||||
@property
|
||||
def statements(self):
|
||||
return self.comments + self.header + self.body + self.end
|
||||
|
||||
|
||||
def set_bounds(self, bounds):
|
||||
pass
|
||||
|
||||
|
||||
def _paint_background(self):
|
||||
pass
|
||||
|
||||
|
||||
def _select_aperture(self, aperture):
|
||||
|
||||
|
||||
# Select the right aperture if not already selected
|
||||
if aperture:
|
||||
if isinstance(aperture, Circle):
|
||||
|
|
@ -168,61 +168,61 @@ class Rs274xContext(GerberContext):
|
|||
aper = self._get_amacro(aperture)
|
||||
else:
|
||||
raise NotImplementedError('Line with invalid aperture type')
|
||||
|
||||
|
||||
if aper.d != self._dcode:
|
||||
self.body.append(ApertureStmt(aper.d))
|
||||
self._dcode = aper.d
|
||||
|
||||
|
||||
def _pre_render_primitive(self, primitive):
|
||||
|
||||
|
||||
if hasattr(primitive, 'comment'):
|
||||
self.body.append(CommentStmt(primitive.comment))
|
||||
|
||||
|
||||
def _render_line(self, line, color):
|
||||
|
||||
|
||||
self._select_aperture(line.aperture)
|
||||
|
||||
|
||||
self._render_level_polarity(line)
|
||||
|
||||
|
||||
# Get the right function
|
||||
if self._func != CoordStmt.FUNC_LINEAR:
|
||||
func = CoordStmt.FUNC_LINEAR
|
||||
else:
|
||||
func = None
|
||||
self._func = CoordStmt.FUNC_LINEAR
|
||||
|
||||
|
||||
if self._pos != line.start:
|
||||
self.body.append(CoordStmt.move(func, self._simplify_point(line.start)))
|
||||
self._pos = line.start
|
||||
# We already set the function, so the next command doesn't require that
|
||||
func = None
|
||||
|
||||
|
||||
point = self._simplify_point(line.end)
|
||||
|
||||
|
||||
# In some files, we see a lot of duplicated ponts, so omit those
|
||||
if point[0] != None or point[1] != None:
|
||||
self.body.append(CoordStmt.line(func, self._simplify_point(line.end)))
|
||||
self._pos = line.end
|
||||
elif func:
|
||||
self.body.append(CoordStmt.mode(func))
|
||||
|
||||
|
||||
def _render_arc(self, arc, color):
|
||||
|
||||
|
||||
# Optionally set the quadrant mode if it has changed:
|
||||
if arc.quadrant_mode != self._quadrant_mode:
|
||||
|
||||
|
||||
if arc.quadrant_mode != 'multi-quadrant':
|
||||
self.body.append(QuadrantModeStmt.single())
|
||||
else:
|
||||
self.body.append(QuadrantModeStmt.multi())
|
||||
|
||||
|
||||
self._quadrant_mode = arc.quadrant_mode
|
||||
|
||||
|
||||
# Select the right aperture if not already selected
|
||||
self._select_aperture(arc.aperture)
|
||||
|
||||
|
||||
self._render_level_polarity(arc)
|
||||
|
||||
|
||||
# Find the right movement mode. Always set to be sure it is really right
|
||||
dir = arc.direction
|
||||
if dir == 'clockwise':
|
||||
|
|
@ -233,59 +233,59 @@ class Rs274xContext(GerberContext):
|
|||
self._func = CoordStmt.FUNC_ARC_CCW
|
||||
else:
|
||||
raise ValueError('Invalid circular interpolation mode')
|
||||
|
||||
|
||||
if self._pos != arc.start:
|
||||
# TODO I'm not sure if this is right
|
||||
self.body.append(CoordStmt.move(CoordStmt.FUNC_LINEAR, self._simplify_point(arc.start)))
|
||||
self._pos = arc.start
|
||||
|
||||
|
||||
center = self._simplify_offset(arc.center, arc.start)
|
||||
end = self._simplify_point(arc.end)
|
||||
self.body.append(CoordStmt.arc(func, end, center))
|
||||
self._pos = arc.end
|
||||
|
||||
def _render_region(self, region, color):
|
||||
|
||||
|
||||
self._render_level_polarity(region)
|
||||
|
||||
|
||||
self.body.append(RegionModeStmt.on())
|
||||
|
||||
|
||||
for p in region.primitives:
|
||||
|
||||
|
||||
if isinstance(p, Line):
|
||||
self._render_line(p, color)
|
||||
else:
|
||||
self._render_arc(p, color)
|
||||
|
||||
|
||||
if self.explicit_region_move_end:
|
||||
self.body.append(CoordStmt.move(None, None))
|
||||
|
||||
self.body.append(RegionModeStmt.off())
|
||||
|
||||
|
||||
def _render_level_polarity(self, region):
|
||||
if region.level_polarity != self._level_polarity:
|
||||
self._level_polarity = region.level_polarity
|
||||
self.body.append(LPParamStmt.from_region(region))
|
||||
|
||||
|
||||
def _render_flash(self, primitive, aperture):
|
||||
|
||||
|
||||
self._render_level_polarity(primitive)
|
||||
|
||||
|
||||
if aperture.d != self._dcode:
|
||||
self.body.append(ApertureStmt(aperture.d))
|
||||
self._dcode = aperture.d
|
||||
|
||||
|
||||
if self.condensed_flash:
|
||||
self.body.append(CoordStmt.flash(self._simplify_point(primitive.position)))
|
||||
else:
|
||||
self.body.append(CoordStmt.move(None, self._simplify_point(primitive.position)))
|
||||
self.body.append(CoordStmt.flash(None))
|
||||
|
||||
|
||||
self._pos = primitive.position
|
||||
|
||||
|
||||
def _get_circle(self, diameter, hole_diameter, dcode = None):
|
||||
'''Define a circlar aperture'''
|
||||
|
||||
|
||||
aper = self._circles.get((diameter, hole_diameter), None)
|
||||
|
||||
if not aper:
|
||||
|
|
@ -294,13 +294,13 @@ class Rs274xContext(GerberContext):
|
|||
self._next_dcode += 1
|
||||
else:
|
||||
self._next_dcode = max(dcode + 1, self._next_dcode)
|
||||
|
||||
|
||||
aper = ADParamStmt.circle(dcode, diameter, hole_diameter)
|
||||
self._circles[(diameter, hole_diameter)] = aper
|
||||
self.header.append(aper)
|
||||
|
||||
return aper
|
||||
|
||||
|
||||
def _render_circle(self, circle, color):
|
||||
|
||||
aper = self._get_circle(circle.diameter, circle.hole_diameter)
|
||||
|
|
@ -308,122 +308,122 @@ class Rs274xContext(GerberContext):
|
|||
|
||||
def _get_rectangle(self, width, height, dcode = None):
|
||||
'''Get a rectanglar aperture. If it isn't defined, create it'''
|
||||
|
||||
|
||||
key = (width, height)
|
||||
aper = self._rects.get(key, None)
|
||||
|
||||
|
||||
if not aper:
|
||||
if not dcode:
|
||||
dcode = self._next_dcode
|
||||
self._next_dcode += 1
|
||||
else:
|
||||
self._next_dcode = max(dcode + 1, self._next_dcode)
|
||||
|
||||
|
||||
aper = ADParamStmt.rect(dcode, width, height)
|
||||
self._rects[(width, height)] = aper
|
||||
self.header.append(aper)
|
||||
|
||||
|
||||
return aper
|
||||
|
||||
def _render_rectangle(self, rectangle, color):
|
||||
|
||||
|
||||
aper = self._get_rectangle(rectangle.width, rectangle.height)
|
||||
self._render_flash(rectangle, aper)
|
||||
|
||||
|
||||
def _get_obround(self, width, height, dcode = None):
|
||||
|
||||
|
||||
key = (width, height)
|
||||
aper = self._obrounds.get(key, None)
|
||||
|
||||
|
||||
if not aper:
|
||||
if not dcode:
|
||||
dcode = self._next_dcode
|
||||
self._next_dcode += 1
|
||||
else:
|
||||
self._next_dcode = max(dcode + 1, self._next_dcode)
|
||||
|
||||
|
||||
aper = ADParamStmt.obround(dcode, width, height)
|
||||
self._obrounds[key] = aper
|
||||
self.header.append(aper)
|
||||
|
||||
|
||||
return aper
|
||||
|
||||
|
||||
def _render_obround(self, obround, color):
|
||||
|
||||
|
||||
aper = self._get_obround(obround.width, obround.height)
|
||||
self._render_flash(obround, aper)
|
||||
|
||||
|
||||
def _render_polygon(self, polygon, color):
|
||||
|
||||
|
||||
aper = self._get_polygon(polygon.radius, polygon.sides, polygon.rotation, polygon.hole_radius)
|
||||
self._render_flash(polygon, aper)
|
||||
|
||||
|
||||
def _get_polygon(self, radius, num_vertices, rotation, hole_radius, dcode = None):
|
||||
|
||||
|
||||
key = (radius, num_vertices, rotation, hole_radius)
|
||||
aper = self._polygons.get(key, None)
|
||||
|
||||
|
||||
if not aper:
|
||||
if not dcode:
|
||||
dcode = self._next_dcode
|
||||
self._next_dcode += 1
|
||||
else:
|
||||
self._next_dcode = max(dcode + 1, self._next_dcode)
|
||||
|
||||
|
||||
aper = ADParamStmt.polygon(dcode, radius * 2, num_vertices, rotation, hole_radius * 2)
|
||||
self._polygons[key] = aper
|
||||
self.header.append(aper)
|
||||
|
||||
|
||||
return aper
|
||||
|
||||
|
||||
def _render_drill(self, drill, color):
|
||||
raise ValueError('Drills are not valid in RS274X files')
|
||||
|
||||
|
||||
def _hash_amacro(self, amgroup):
|
||||
'''Calculate a very quick hash code for deciding if we should even check AM groups for comparision'''
|
||||
|
||||
|
||||
# We always start with an X because this forms part of the name
|
||||
# Basically, in some cases, the name might start with a C, R, etc. That can appear
|
||||
# to conflict with normal aperture definitions. Technically, it shouldn't because normal
|
||||
# aperture definitions should have a comma, but in some cases the commit is omitted
|
||||
hash = 'X'
|
||||
for primitive in amgroup.primitives:
|
||||
|
||||
|
||||
hash += primitive.__class__.__name__[0]
|
||||
|
||||
|
||||
bbox = primitive.bounding_box
|
||||
hash += str((bbox[0][1] - bbox[0][0]) * 100000)[0:2]
|
||||
hash += str((bbox[1][1] - bbox[1][0]) * 100000)[0:2]
|
||||
|
||||
|
||||
if hasattr(primitive, 'primitives'):
|
||||
hash += str(len(primitive.primitives))
|
||||
|
||||
|
||||
if isinstance(primitive, Rectangle):
|
||||
hash += str(primitive.width * 1000000)[0:2]
|
||||
hash += str(primitive.height * 1000000)[0:2]
|
||||
elif isinstance(primitive, Circle):
|
||||
hash += str(primitive.diameter * 1000000)[0:2]
|
||||
|
||||
|
||||
if len(hash) > 20:
|
||||
# The hash might actually get quite complex, so stop before
|
||||
# it gets too long
|
||||
break
|
||||
|
||||
|
||||
return hash
|
||||
|
||||
def _get_amacro(self, amgroup, dcode = None):
|
||||
# Macros are a little special since we don't have a good way to compare them quickly
|
||||
# but in most cases, this should work
|
||||
|
||||
|
||||
hash = self._hash_amacro(amgroup)
|
||||
macro = None
|
||||
macroinfo = self._macros.get(hash, None)
|
||||
|
||||
|
||||
if macroinfo:
|
||||
|
||||
|
||||
# We have a definition, but check that the groups actually are the same
|
||||
for macro in macroinfo:
|
||||
|
||||
|
||||
# Macros should have positions, right? But if the macro is selected for non-flashes
|
||||
# then it won't have a position. This is of course a bad gerber, but they do exist
|
||||
if amgroup.position:
|
||||
|
|
@ -435,7 +435,7 @@ class Rs274xContext(GerberContext):
|
|||
if amgroup.equivalent(macro[1], offset):
|
||||
break
|
||||
macro = None
|
||||
|
||||
|
||||
# Did we find one in the group0
|
||||
if not macro:
|
||||
# This is a new macro, so define it
|
||||
|
|
@ -444,52 +444,51 @@ class Rs274xContext(GerberContext):
|
|||
self._next_dcode += 1
|
||||
else:
|
||||
self._next_dcode = max(dcode + 1, self._next_dcode)
|
||||
|
||||
|
||||
# Create the statements
|
||||
# TODO
|
||||
amrenderer = AMGroupContext()
|
||||
statement = amrenderer.render(amgroup, hash)
|
||||
|
||||
|
||||
self.header.append(statement)
|
||||
|
||||
|
||||
aperdef = ADParamStmt.macro(dcode, hash)
|
||||
self.header.append(aperdef)
|
||||
|
||||
|
||||
# Store the dcode and the original so we can check if it really is the same
|
||||
# If it didn't have a postition, set it to 0, 0
|
||||
if amgroup.position == None:
|
||||
amgroup.position = (0, 0)
|
||||
macro = (aperdef, amgroup)
|
||||
|
||||
|
||||
if macroinfo:
|
||||
macroinfo.append(macro)
|
||||
else:
|
||||
self._macros[hash] = [macro]
|
||||
|
||||
self._macros[hash] = [macro]
|
||||
|
||||
return macro[0]
|
||||
|
||||
|
||||
def _render_amgroup(self, amgroup, color):
|
||||
|
||||
|
||||
aper = self._get_amacro(amgroup)
|
||||
self._render_flash(amgroup, aper)
|
||||
|
||||
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)
|
||||
stream = StringIO()
|
||||
for statement in statements:
|
||||
stream.write(statement + '\n')
|
||||
|
||||
|
||||
return stream
|
||||
|
||||
|
|
@ -25,12 +25,12 @@ COLORS = {
|
|||
'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),
|
||||
'green soldermask': (0.0, 0.412, 0.278),
|
||||
'blue soldermask': (0.059, 0.478, 0.651),
|
||||
'red soldermask': (0.968, 0.169, 0.165),
|
||||
'black soldermask': (0.298, 0.275, 0.282),
|
||||
'purple soldermask': (0.2, 0.0, 0.334),
|
||||
'enig copper': (0.686, 0.525, 0.510),
|
||||
'enig copper': (0.694, 0.533, 0.514),
|
||||
'hasl copper': (0.871, 0.851, 0.839)
|
||||
}
|
||||
|
||||
|
|
@ -39,13 +39,13 @@ class Theme(object):
|
|||
|
||||
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.background = kwargs.get('background', RenderSettings(COLORS['fr-4']))
|
||||
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'], alpha=0.8, invert=True))
|
||||
self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], alpha=0.8, invert=True))
|
||||
self.bottomsilk = kwargs.get('bottomsilk', RenderSettings(COLORS['white'], mirror=True))
|
||||
self.topmask = kwargs.get('topmask', RenderSettings(COLORS['green soldermask'], alpha=0.85, invert=True))
|
||||
self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], alpha=0.85, invert=True, mirror=True))
|
||||
self.top = kwargs.get('top', RenderSettings(COLORS['hasl copper']))
|
||||
self.bottom = kwargs.get('top', RenderSettings(COLORS['hasl copper']))
|
||||
self.bottom = kwargs.get('bottom', RenderSettings(COLORS['hasl copper'], mirror=True))
|
||||
self.drill = kwargs.get('drill', RenderSettings(COLORS['black']))
|
||||
self.ipc_netlist = kwargs.get('ipc_netlist', RenderSettings(COLORS['red']))
|
||||
|
||||
|
|
@ -53,18 +53,28 @@ class Theme(object):
|
|||
return getattr(self, key)
|
||||
|
||||
def get(self, key, noneval=None):
|
||||
val = getattr(self, key)
|
||||
val = getattr(self, key, None)
|
||||
return val if val is not None else noneval
|
||||
|
||||
|
||||
THEMES = {
|
||||
'default': Theme(),
|
||||
'OSH Park': Theme(name='OSH Park',
|
||||
background=RenderSettings(COLORS['purple soldermask']),
|
||||
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)),
|
||||
bottom=RenderSettings(COLORS['enig copper'], mirror=True),
|
||||
topmask=RenderSettings(COLORS['purple soldermask'], alpha=0.85, invert=True),
|
||||
bottommask=RenderSettings(COLORS['purple soldermask'], alpha=0.85, invert=True, mirror=True),
|
||||
topsilk=RenderSettings(COLORS['white'], alpha=0.8),
|
||||
bottomsilk=RenderSettings(COLORS['white'], alpha=0.8, mirror=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)),
|
||||
|
||||
'Transparent Copper': Theme(name='Transparent',
|
||||
background=RenderSettings((0.9, 0.9, 0.9)),
|
||||
top=RenderSettings(COLORS['red'], alpha=0.5),
|
||||
bottom=RenderSettings(COLORS['blue'], alpha=0.5),
|
||||
drill=RenderSettings((0.3, 0.3, 0.3))),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ def read(filename):
|
|||
return GerberParser().parse(filename)
|
||||
|
||||
|
||||
def loads(data):
|
||||
def loads(data, filename=None):
|
||||
""" Generate a GerberFile object from rs274x data in memory
|
||||
|
||||
Parameters
|
||||
|
|
@ -58,12 +58,15 @@ def loads(data):
|
|||
data : string
|
||||
string containing gerber file contents
|
||||
|
||||
filename : string, optional
|
||||
string containing the filename of the data source
|
||||
|
||||
Returns
|
||||
-------
|
||||
file : :class:`gerber.rs274x.GerberFile`
|
||||
A GerberFile created from the specified file.
|
||||
"""
|
||||
return GerberParser().parse_raw(data)
|
||||
return GerberParser().parse_raw(data, filename)
|
||||
|
||||
|
||||
class GerberFile(CamFile):
|
||||
|
|
@ -98,7 +101,7 @@ class GerberFile(CamFile):
|
|||
|
||||
def __init__(self, statements, settings, primitives, apertures, filename=None):
|
||||
super(GerberFile, self).__init__(statements, settings, primitives, filename)
|
||||
|
||||
|
||||
self.apertures = apertures
|
||||
|
||||
@property
|
||||
|
|
@ -115,15 +118,18 @@ class GerberFile(CamFile):
|
|||
def bounds(self):
|
||||
min_x = min_y = 1000000
|
||||
max_x = max_y = -1000000
|
||||
|
||||
for stmt in [stmt for stmt in self.statements if isinstance(stmt, CoordStmt)]:
|
||||
if stmt.x is not None:
|
||||
min_x = min(stmt.x, min_x)
|
||||
max_x = max(stmt.x, max_x)
|
||||
|
||||
if stmt.y is not None:
|
||||
min_y = min(stmt.y, min_y)
|
||||
max_y = max(stmt.y, max_y)
|
||||
|
||||
return ((min_x, max_x), (min_y, max_y))
|
||||
|
||||
|
||||
@property
|
||||
def bounding_box(self):
|
||||
min_x = min_y = 1000000
|
||||
|
|
@ -258,7 +264,7 @@ class GerberParser(object):
|
|||
stmt.units = self.settings.units
|
||||
|
||||
return GerberFile(self.statements, self.settings, self.primitives, self.apertures.values(), filename)
|
||||
|
||||
|
||||
def _split_commands(self, data):
|
||||
"""
|
||||
Split the data into commands. Commands end with * (and also newline to help with some badly formatted files)
|
||||
|
|
@ -267,24 +273,24 @@ class GerberParser(object):
|
|||
length = len(data)
|
||||
start = 0
|
||||
in_header = True
|
||||
|
||||
|
||||
for cur in range(0, length):
|
||||
|
||||
val = data[cur]
|
||||
|
||||
|
||||
if val == '%' and start == cur:
|
||||
in_header = True
|
||||
continue
|
||||
|
||||
|
||||
if val == '\r' or val == '\n':
|
||||
if start != cur:
|
||||
yield data[start:cur]
|
||||
start = cur + 1
|
||||
|
||||
|
||||
elif not in_header and val == '*':
|
||||
yield data[start:cur + 1]
|
||||
start = cur + 1
|
||||
|
||||
|
||||
elif in_header and val == '%':
|
||||
yield data[start:cur + 1]
|
||||
start = cur + 1
|
||||
|
|
@ -318,13 +324,13 @@ class GerberParser(object):
|
|||
did_something = True # make sure we do at least one loop
|
||||
while did_something and len(line) > 0:
|
||||
did_something = False
|
||||
|
||||
|
||||
# consume empty data blocks
|
||||
if line[0] == '*':
|
||||
line = line[1:]
|
||||
did_something = True
|
||||
continue
|
||||
|
||||
|
||||
# coord
|
||||
(coord, r) = _match_one(self.COORD_STMT, line)
|
||||
if coord:
|
||||
|
|
@ -332,7 +338,7 @@ class GerberParser(object):
|
|||
line = r
|
||||
did_something = True
|
||||
continue
|
||||
|
||||
|
||||
# aperture selection
|
||||
(aperture, r) = _match_one(self.APERTURE_STMT, line)
|
||||
if aperture:
|
||||
|
|
@ -485,32 +491,32 @@ class GerberParser(object):
|
|||
aperture = None
|
||||
if shape == 'C':
|
||||
diameter = modifiers[0][0]
|
||||
|
||||
|
||||
if len(modifiers[0]) >= 2:
|
||||
hole_diameter = modifiers[0][1]
|
||||
else:
|
||||
hole_diameter = None
|
||||
|
||||
|
||||
aperture = Circle(position=None, diameter=diameter, hole_diameter=hole_diameter, units=self.settings.units)
|
||||
elif shape == 'R':
|
||||
width = modifiers[0][0]
|
||||
height = modifiers[0][1]
|
||||
|
||||
|
||||
if len(modifiers[0]) >= 3:
|
||||
hole_diameter = modifiers[0][2]
|
||||
else:
|
||||
hole_diameter = None
|
||||
|
||||
|
||||
aperture = Rectangle(position=None, width=width, height=height, hole_diameter=hole_diameter, units=self.settings.units)
|
||||
elif shape == 'O':
|
||||
width = modifiers[0][0]
|
||||
height = modifiers[0][1]
|
||||
|
||||
|
||||
if len(modifiers[0]) >= 3:
|
||||
hole_diameter = modifiers[0][2]
|
||||
else:
|
||||
hole_diameter = None
|
||||
|
||||
|
||||
aperture = Obround(position=None, width=width, height=height, hole_diameter=hole_diameter, units=self.settings.units)
|
||||
elif shape == 'P':
|
||||
outer_diameter = modifiers[0][0]
|
||||
|
|
@ -519,7 +525,7 @@ class GerberParser(object):
|
|||
rotation = modifiers[0][2]
|
||||
else:
|
||||
rotation = 0
|
||||
|
||||
|
||||
if len(modifiers[0]) > 3:
|
||||
hole_diameter = modifiers[0][3]
|
||||
else:
|
||||
|
|
@ -528,6 +534,7 @@ class GerberParser(object):
|
|||
else:
|
||||
aperture = self.macros[shape].build(modifiers)
|
||||
|
||||
aperture.units = self.settings.units
|
||||
self.apertures[d] = aperture
|
||||
|
||||
def _evaluate_mode(self, stmt):
|
||||
|
|
@ -636,7 +643,7 @@ class GerberParser(object):
|
|||
units=self.settings.units))
|
||||
|
||||
elif self.op == "D02" or self.op == "D2":
|
||||
|
||||
|
||||
if self.region_mode == "on":
|
||||
# D02 in the middle of a region finishes that region and starts a new one
|
||||
if self.current_region and len(self.current_region) > 1:
|
||||
|
|
@ -646,7 +653,6 @@ class GerberParser(object):
|
|||
elif self.op == "D03" or self.op == "D3":
|
||||
primitive = copy.deepcopy(self.apertures[self.aperture])
|
||||
|
||||
|
||||
if primitive is not None:
|
||||
|
||||
if not isinstance(primitive, AMParamStmt):
|
||||
|
|
@ -663,32 +669,32 @@ class GerberParser(object):
|
|||
if renderable is not None:
|
||||
self.primitives.append(renderable)
|
||||
self.x, self.y = x, y
|
||||
|
||||
|
||||
def _find_center(self, start, end, offsets):
|
||||
"""
|
||||
In single quadrant mode, the offsets are always positive, which means there are 4 possible centers.
|
||||
The correct center is the only one that results in an arc with sweep angle of less than or equal to 90 degrees
|
||||
"""
|
||||
|
||||
|
||||
if self.quadrant_mode == 'single-quadrant':
|
||||
|
||||
# The Gerber spec says single quadrant only has one possible center, and you can detect
|
||||
|
||||
# The Gerber spec says single quadrant only has one possible center, and you can detect
|
||||
# based on the angle. But for real files, this seems to work better - there is usually
|
||||
# only one option that makes sense for the center (since the distance should be the same
|
||||
# from start and end). Find the center that makes the most sense
|
||||
sqdist_diff_min = sys.maxint
|
||||
center = None
|
||||
for factors in [(1, 1), (1, -1), (-1, 1), (-1, -1)]:
|
||||
|
||||
|
||||
test_center = (start[0] + offsets[0] * factors[0], start[1] + offsets[1] * factors[1])
|
||||
|
||||
|
||||
sqdist_start = sq_distance(start, test_center)
|
||||
sqdist_end = sq_distance(end, test_center)
|
||||
|
||||
|
||||
if abs(sqdist_start - sqdist_end) < sqdist_diff_min:
|
||||
center = test_center
|
||||
sqdist_diff_min = abs(sqdist_start - sqdist_end)
|
||||
|
||||
|
||||
return center
|
||||
else:
|
||||
return (start[0] + offsets[0], start[1] + offsets[1])
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -166,6 +166,7 @@ def test_AMOUtlinePrimitive_dump():
|
|||
|
||||
|
||||
|
||||
|
||||
def test_AMOutlinePrimitive_conversion():
|
||||
o = AMOutlinePrimitive(
|
||||
4, 'on', (0, 0), [(25.4, 25.4), (25.4, 0), (0, 0)], 0)
|
||||
|
|
@ -261,6 +262,7 @@ def test_AMThermalPrimitive_validation():
|
|||
|
||||
|
||||
|
||||
|
||||
def test_AMThermalPrimitive_factory():
|
||||
t = AMThermalPrimitive.from_gerber('7,0,0,7,6,0.2,45*')
|
||||
assert_equal(t.code, 7)
|
||||
|
|
@ -272,12 +274,14 @@ def test_AMThermalPrimitive_factory():
|
|||
|
||||
|
||||
|
||||
|
||||
def test_AMThermalPrimitive_dump():
|
||||
t = AMThermalPrimitive.from_gerber('7,0,0,7,6,0.2,30*')
|
||||
assert_equal(t.to_gerber(), '7,0,0,7.0,6.0,0.2,30.0*')
|
||||
|
||||
|
||||
|
||||
|
||||
def test_AMThermalPrimitive_conversion():
|
||||
t = AMThermalPrimitive(7, (25.4, 25.4), 25.4, 25.4, 25.4, 0.0)
|
||||
t.to_inch()
|
||||
|
|
|
|||
|
|
@ -2,57 +2,56 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Author: Garret Fick <garret@ficksworkshop.com>
|
||||
import io
|
||||
import os
|
||||
|
||||
|
||||
from ..render.cairo_backend import GerberCairoContext
|
||||
from ..rs274x import read
|
||||
from .tests import *
|
||||
from nose.tools import assert_tuple_equal
|
||||
|
||||
def test_render_two_boxes():
|
||||
def _DISABLED_test_render_two_boxes():
|
||||
"""Umaco exapmle of two boxes"""
|
||||
_test_render('resources/example_two_square_boxes.gbr', 'golden/example_two_square_boxes.png')
|
||||
|
||||
|
||||
def test_render_single_quadrant():
|
||||
def _DISABLED_test_render_single_quadrant():
|
||||
"""Umaco exapmle of a single quadrant arc"""
|
||||
_test_render('resources/example_single_quadrant.gbr', 'golden/example_single_quadrant.png')
|
||||
|
||||
|
||||
def test_render_simple_contour():
|
||||
def _DISABLED_test_render_simple_contour():
|
||||
"""Umaco exapmle of a simple arrow-shaped contour"""
|
||||
gerber = _test_render('resources/example_simple_contour.gbr', 'golden/example_simple_contour.png')
|
||||
|
||||
|
||||
# Check the resulting dimensions
|
||||
assert_tuple_equal(((2.0, 11.0), (1.0, 9.0)), gerber.bounding_box)
|
||||
|
||||
|
||||
def test_render_single_contour_1():
|
||||
|
||||
def _DISABLED_test_render_single_contour_1():
|
||||
"""Umaco example of a single contour
|
||||
|
||||
|
||||
The resulting image for this test is used by other tests because they must generate the same output."""
|
||||
_test_render('resources/example_single_contour_1.gbr', 'golden/example_single_contour.png')
|
||||
|
||||
|
||||
def test_render_single_contour_2():
|
||||
def _DISABLED_test_render_single_contour_2():
|
||||
"""Umaco exapmle of a single contour, alternate contour end order
|
||||
|
||||
|
||||
The resulting image for this test is used by other tests because they must generate the same output."""
|
||||
_test_render('resources/example_single_contour_2.gbr', 'golden/example_single_contour.png')
|
||||
|
||||
|
||||
def test_render_single_contour_3():
|
||||
def _DISABLED_test_render_single_contour_3():
|
||||
"""Umaco exapmle of a single contour with extra line"""
|
||||
_test_render('resources/example_single_contour_3.gbr', 'golden/example_single_contour_3.png')
|
||||
|
||||
|
||||
def test_render_not_overlapping_contour():
|
||||
|
||||
|
||||
def _DISABLED_test_render_not_overlapping_contour():
|
||||
"""Umaco example of D02 staring a second contour"""
|
||||
_test_render('resources/example_not_overlapping_contour.gbr', 'golden/example_not_overlapping_contour.png')
|
||||
|
||||
|
||||
def test_render_not_overlapping_touching():
|
||||
def _DISABLED_test_render_not_overlapping_touching():
|
||||
"""Umaco example of D02 staring a second contour"""
|
||||
_test_render('resources/example_not_overlapping_touching.gbr', 'golden/example_not_overlapping_touching.png')
|
||||
|
||||
|
|
@ -69,7 +68,7 @@ def test_render_overlapping_contour():
|
|||
|
||||
def _DISABLED_test_render_level_holes():
|
||||
"""Umaco example of using multiple levels to create multiple holes"""
|
||||
|
||||
|
||||
# TODO This is clearly rendering wrong. I'm temporarily checking this in because there are more
|
||||
# rendering fixes in the related repository that may resolve these.
|
||||
_test_render('resources/example_level_holes.gbr', 'golden/example_overlapping_contour.png')
|
||||
|
|
@ -79,16 +78,16 @@ def _DISABLED_test_render_cutin():
|
|||
"""Umaco example of using a cutin"""
|
||||
|
||||
# TODO This is clearly rendering wrong.
|
||||
_test_render('resources/example_cutin.gbr', 'golden/example_cutin.png')
|
||||
_test_render('resources/example_cutin.gbr', 'golden/example_cutin.png', '/Users/ham/Desktop/cutin.png')
|
||||
|
||||
|
||||
def test_render_fully_coincident():
|
||||
def _DISABLED_test_render_fully_coincident():
|
||||
"""Umaco example of coincident lines rendering two contours"""
|
||||
|
||||
_test_render('resources/example_fully_coincident.gbr', 'golden/example_fully_coincident.png')
|
||||
|
||||
|
||||
def test_render_coincident_hole():
|
||||
def _DISABLED_test_render_coincident_hole():
|
||||
"""Umaco example of coincident lines rendering a hole in the contour"""
|
||||
|
||||
_test_render('resources/example_coincident_hole.gbr', 'golden/example_coincident_hole.png')
|
||||
|
|
@ -98,39 +97,40 @@ def test_render_cutin_multiple():
|
|||
"""Umaco example of a region with multiple cutins"""
|
||||
|
||||
_test_render('resources/example_cutin_multiple.gbr', 'golden/example_cutin_multiple.png')
|
||||
|
||||
|
||||
def test_flash_circle():
|
||||
|
||||
def _DISABLED_test_flash_circle():
|
||||
"""Umaco example a simple circular flash with and without a hole"""
|
||||
|
||||
_test_render('resources/example_flash_circle.gbr', 'golden/example_flash_circle.png')
|
||||
_test_render('resources/example_flash_circle.gbr', 'golden/example_flash_circle.png',
|
||||
'/Users/ham/Desktop/flashcircle.png')
|
||||
|
||||
|
||||
def test_flash_rectangle():
|
||||
def _DISABLED_test_flash_rectangle():
|
||||
"""Umaco example a simple rectangular flash with and without a hole"""
|
||||
|
||||
_test_render('resources/example_flash_rectangle.gbr', 'golden/example_flash_rectangle.png')
|
||||
|
||||
|
||||
def test_flash_obround():
|
||||
def _DISABLED_test_flash_obround():
|
||||
"""Umaco example a simple obround flash with and without a hole"""
|
||||
|
||||
_test_render('resources/example_flash_obround.gbr', 'golden/example_flash_obround.png')
|
||||
|
||||
|
||||
def test_flash_polygon():
|
||||
def _DISABLED_test_flash_polygon():
|
||||
"""Umaco example a simple polygon flash with and without a hole"""
|
||||
|
||||
_test_render('resources/example_flash_polygon.gbr', 'golden/example_flash_polygon.png')
|
||||
|
||||
|
||||
def test_holes_dont_clear():
|
||||
def _DISABLED_test_holes_dont_clear():
|
||||
"""Umaco example that an aperture with a hole does not clear the area"""
|
||||
|
||||
_test_render('resources/example_holes_dont_clear.gbr', 'golden/example_holes_dont_clear.png')
|
||||
|
||||
|
||||
def test_render_am_exposure_modifier():
|
||||
def _DISABLED_test_render_am_exposure_modifier():
|
||||
"""Umaco example that an aperture macro with a hole does not clear the area"""
|
||||
|
||||
_test_render('resources/example_am_exposure_modifier.gbr', 'golden/example_am_exposure_modifier.png')
|
||||
|
|
@ -143,7 +143,7 @@ def _resolve_path(path):
|
|||
|
||||
def _test_render(gerber_path, png_expected_path, create_output_path = None):
|
||||
"""Render the gerber file and compare to the expected PNG output.
|
||||
|
||||
|
||||
Parameters
|
||||
----------
|
||||
gerber_path : string
|
||||
|
|
@ -152,14 +152,14 @@ def _test_render(gerber_path, png_expected_path, create_output_path = None):
|
|||
Path to the PNG file to compare to
|
||||
create_output : string|None
|
||||
If not None, write the generated PNG to the specified path.
|
||||
This is primarily to help with
|
||||
This is primarily to help with
|
||||
"""
|
||||
|
||||
|
||||
gerber_path = _resolve_path(gerber_path)
|
||||
png_expected_path = _resolve_path(png_expected_path)
|
||||
if create_output_path:
|
||||
create_output_path = _resolve_path(create_output_path)
|
||||
|
||||
|
||||
gerber = read(gerber_path)
|
||||
|
||||
# Create PNG image to the memory stream
|
||||
|
|
@ -167,7 +167,7 @@ def _test_render(gerber_path, png_expected_path, create_output_path = None):
|
|||
gerber.render(ctx)
|
||||
|
||||
actual_bytes = ctx.dump(None)
|
||||
|
||||
|
||||
# If we want to write the file bytes, do it now. This happens
|
||||
if create_output_path:
|
||||
with open(create_output_path, 'wb') as out_file:
|
||||
|
|
@ -176,14 +176,14 @@ def _test_render(gerber_path, png_expected_path, create_output_path = None):
|
|||
# So if we are creating the output, we make the test fail on purpose so you
|
||||
# won't forget to disable this
|
||||
assert_false(True, 'Test created the output %s. This needs to be disabled to make sure the test behaves correctly' % (create_output_path,))
|
||||
|
||||
|
||||
# Read the expected PNG file
|
||||
|
||||
|
||||
with open(png_expected_path, 'rb') as expected_file:
|
||||
expected_bytes = expected_file.read()
|
||||
|
||||
|
||||
# Don't directly use assert_equal otherwise any failure pollutes the test results
|
||||
equal = (expected_bytes == actual_bytes)
|
||||
assert_true(equal)
|
||||
|
||||
|
||||
return gerber
|
||||
|
|
|
|||
|
|
@ -116,33 +116,22 @@ def test_zeros():
|
|||
def test_filesettings_validation():
|
||||
""" Test FileSettings constructor argument validation
|
||||
"""
|
||||
<<<<<<< HEAD
|
||||
# absolute-ish is not a valid notation
|
||||
assert_raises(ValueError, FileSettings, 'absolute-ish',
|
||||
'inch', None, (2, 5), None)
|
||||
|
||||
|
||||
# degrees kelvin isn't a valid unit for a CAM file
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'degrees kelvin', None, (2, 5), None)
|
||||
|
||||
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'inch', 'leading', (2, 5), 'leading')
|
||||
|
||||
|
||||
# Technnically this should be an error, but Eangle files often do this incorrectly so we
|
||||
# allow it
|
||||
#assert_raises(ValueError, FileSettings, 'absolute',
|
||||
# 'inch', 'following', (2, 5), None)
|
||||
|
||||
=======
|
||||
assert_raises(ValueError, FileSettings, 'absolute-ish',
|
||||
'inch', None, (2, 5), None)
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'degrees kelvin', None, (2, 5), None)
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'inch', 'leading', (2, 5), 'leading')
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'inch', 'following', (2, 5), None)
|
||||
>>>>>>> 5476da8... Fix a bunch of rendering bugs.
|
||||
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
'inch', None, (2, 5), 'following')
|
||||
assert_raises(ValueError, FileSettings, 'absolute',
|
||||
|
|
|
|||
|
|
@ -38,4 +38,4 @@ def test_load_from_string():
|
|||
def test_file_type_validation():
|
||||
""" Test file format validation
|
||||
"""
|
||||
assert_raises(ParseError, read, 'LICENSE')
|
||||
assert_raises(ParseError, read, __file__)
|
||||
|
|
|
|||
|
|
@ -487,9 +487,11 @@ def test_AMParamStmt_dump():
|
|||
s.build()
|
||||
assert_equal(s.to_gerber(), '%AMPOLYGON*5,1,8,25.4,25.4,25.4,0.0*%')
|
||||
|
||||
#TODO - Store Equations and update on unit change...
|
||||
s = AMParamStmt.from_dict({'param': 'AM', 'name': 'OC8', 'macro': '5,1,8,0,0,1.08239X$1,22.5'})
|
||||
s.build()
|
||||
assert_equal(s.to_gerber(), '%AMOC8*5,1,8,0,0,1.08239X$1,22.5*%')
|
||||
#assert_equal(s.to_gerber(), '%AMOC8*5,1,8,0,0,1.08239X$1,22.5*%')
|
||||
assert_equal(s.to_gerber(), '%AMOC8*5,1,8,0,0,0,22.5*%')
|
||||
|
||||
|
||||
def test_AMParamStmt_string():
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@ IPC_D_356_FILE = os.path.join(os.path.dirname(__file__),
|
|||
|
||||
def test_read():
|
||||
ipcfile = read(IPC_D_356_FILE)
|
||||
assert(isinstance(ipcfile, IPC_D_356))
|
||||
assert(isinstance(ipcfile, IPCNetlist))
|
||||
|
||||
|
||||
|
||||
def test_parser():
|
||||
|
|
|
|||
|
|
@ -1,11 +1,33 @@
|
|||
#! /usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Author: Hamilton Kibbe <ham@hamiltonkib.be>
|
||||
# copyright 2016 Hamilton Kibbe <ham@hamiltonkib.be>
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
import os
|
||||
|
||||
from .tests import *
|
||||
from ..layers import guess_layer_class, hints
|
||||
from ..layers import *
|
||||
from ..common import read
|
||||
|
||||
NCDRILL_FILE = os.path.join(os.path.dirname(__file__),
|
||||
'resources/ncdrill.DRD')
|
||||
NETLIST_FILE = os.path.join(os.path.dirname(__file__),
|
||||
'resources/ipc-d-356.ipc')
|
||||
COPPER_FILE = os.path.join(os.path.dirname(__file__),
|
||||
'resources/top_copper.GTL')
|
||||
|
||||
def test_guess_layer_class():
|
||||
""" Test layer type inferred correctly from filename
|
||||
|
|
@ -30,4 +52,51 @@ def test_guess_layer_class():
|
|||
def test_sort_layers():
|
||||
""" Test layer ordering
|
||||
"""
|
||||
pass
|
||||
layers = [
|
||||
PCBLayer(layer_class='drawing'),
|
||||
PCBLayer(layer_class='drill'),
|
||||
PCBLayer(layer_class='bottompaste'),
|
||||
PCBLayer(layer_class='bottomsilk'),
|
||||
PCBLayer(layer_class='bottommask'),
|
||||
PCBLayer(layer_class='bottom'),
|
||||
PCBLayer(layer_class='internal'),
|
||||
PCBLayer(layer_class='top'),
|
||||
PCBLayer(layer_class='topmask'),
|
||||
PCBLayer(layer_class='topsilk'),
|
||||
PCBLayer(layer_class='toppaste'),
|
||||
PCBLayer(layer_class='outline'),
|
||||
]
|
||||
|
||||
layer_order = ['outline', 'toppaste', 'topsilk', 'topmask', 'top',
|
||||
'internal', 'bottom', 'bottommask', 'bottomsilk',
|
||||
'bottompaste', 'drill', 'drawing']
|
||||
bottom_order = list(reversed(layer_order[:10])) + layer_order[10:]
|
||||
assert_equal([l.layer_class for l in sort_layers(layers)], layer_order)
|
||||
assert_equal([l.layer_class for l in sort_layers(layers, from_top=False)],
|
||||
bottom_order)
|
||||
|
||||
|
||||
def test_PCBLayer_from_file():
|
||||
layer = PCBLayer.from_cam(read(COPPER_FILE))
|
||||
assert_true(isinstance(layer, PCBLayer))
|
||||
layer = PCBLayer.from_cam(read(NCDRILL_FILE))
|
||||
assert_true(isinstance(layer, DrillLayer))
|
||||
layer = PCBLayer.from_cam(read(NETLIST_FILE))
|
||||
assert_true(isinstance(layer, PCBLayer))
|
||||
assert_equal(layer.layer_class, 'ipc_netlist')
|
||||
|
||||
|
||||
def test_PCBLayer_bounds():
|
||||
source = read(COPPER_FILE)
|
||||
layer = PCBLayer.from_cam(source)
|
||||
assert_equal(source.bounds, layer.bounds)
|
||||
|
||||
|
||||
def test_DrillLayer_from_cam():
|
||||
no_exceptions = True
|
||||
try:
|
||||
layer = DrillLayer.from_cam(read(NCDRILL_FILE))
|
||||
assert_true(isinstance(layer, DrillLayer))
|
||||
except:
|
||||
no_exceptions = False
|
||||
assert_true(no_exceptions)
|
||||
|
|
|
|||
|
|
@ -13,17 +13,18 @@ def test_primitive_smoketest():
|
|||
try:
|
||||
p.bounding_box
|
||||
assert_false(True, 'should have thrown the exception')
|
||||
except NotImplementedError:
|
||||
except NotImplementedError:
|
||||
pass
|
||||
#assert_raises(NotImplementedError, p.bounding_box)
|
||||
|
||||
p.to_metric()
|
||||
p.to_inch()
|
||||
try:
|
||||
p.offset(1, 1)
|
||||
assert_false(True, 'should have thrown the exception')
|
||||
except NotImplementedError:
|
||||
pass
|
||||
#try:
|
||||
# p.offset(1, 1)
|
||||
# assert_false(True, 'should have thrown the exception')
|
||||
#except NotImplementedError:
|
||||
# pass
|
||||
|
||||
|
||||
|
||||
def test_line_angle():
|
||||
|
|
@ -291,7 +292,7 @@ def test_circle_conversion():
|
|||
assert_equal(c.position, (0.1, 1.))
|
||||
assert_equal(c.diameter, 10.)
|
||||
assert_equal(c.hole_diameter, None)
|
||||
|
||||
|
||||
# Circle initially metric, with hole
|
||||
c = Circle((2.54, 25.4), 254.0, 127.0, units='metric')
|
||||
|
||||
|
|
@ -310,7 +311,7 @@ def test_circle_conversion():
|
|||
assert_equal(c.position, (0.1, 1.))
|
||||
assert_equal(c.diameter, 10.)
|
||||
assert_equal(c.hole_diameter, 5.)
|
||||
|
||||
|
||||
# Circle initially inch, no hole
|
||||
c = Circle((0.1, 1.0), 10.0, units='inch')
|
||||
# No effect
|
||||
|
|
@ -349,7 +350,6 @@ def test_circle_conversion():
|
|||
assert_equal(c.hole_diameter, 127.)
|
||||
|
||||
|
||||
|
||||
def test_circle_offset():
|
||||
c = Circle((0, 0), 1)
|
||||
c.offset(1, 0)
|
||||
|
|
@ -437,13 +437,13 @@ def test_rectangle_ctor():
|
|||
assert_equal(r.position, pos)
|
||||
assert_equal(r.width, width)
|
||||
assert_equal(r.height, height)
|
||||
|
||||
|
||||
def test_rectangle_hole_radius():
|
||||
""" Test rectangle hole diameter calculation
|
||||
"""
|
||||
r = Rectangle((0,0), 2, 2)
|
||||
assert_equal(0, r.hole_radius)
|
||||
|
||||
|
||||
r = Rectangle((0,0), 2, 2, 1)
|
||||
assert_equal(0.5, r.hole_radius)
|
||||
|
||||
|
|
@ -464,7 +464,7 @@ def test_rectangle_bounds():
|
|||
|
||||
def test_rectangle_conversion():
|
||||
"""Test converting rectangles between units"""
|
||||
|
||||
|
||||
# Initially metric no hole
|
||||
r = Rectangle((2.54, 25.4), 254.0, 2540.0, units='metric')
|
||||
|
||||
|
|
@ -482,7 +482,7 @@ def test_rectangle_conversion():
|
|||
assert_equal(r.position, (0.1, 1.0))
|
||||
assert_equal(r.width, 10.0)
|
||||
assert_equal(r.height, 100.0)
|
||||
|
||||
|
||||
# Initially metric with hole
|
||||
r = Rectangle((2.54, 25.4), 254.0, 2540.0, 127.0, units='metric')
|
||||
|
||||
|
|
@ -520,7 +520,7 @@ def test_rectangle_conversion():
|
|||
assert_equal(r.position, (2.54, 25.4))
|
||||
assert_equal(r.width, 254.0)
|
||||
assert_equal(r.height, 2540.0)
|
||||
|
||||
|
||||
# Initially inch with hole
|
||||
r = Rectangle((0.1, 1.0), 10.0, 100.0, 5.0, units='inch')
|
||||
r.to_inch()
|
||||
|
|
@ -887,7 +887,6 @@ def test_polygon_ctor():
|
|||
assert_equal(p.hole_diameter, hole_diameter)
|
||||
|
||||
|
||||
|
||||
def test_polygon_bounds():
|
||||
""" Test polygon bounding box calculation
|
||||
"""
|
||||
|
|
@ -903,7 +902,7 @@ def test_polygon_bounds():
|
|||
|
||||
def test_polygon_conversion():
|
||||
p = Polygon((2.54, 25.4), 3, 254.0, 0, units='metric')
|
||||
|
||||
|
||||
# No effect
|
||||
p.to_metric()
|
||||
assert_equal(p.position, (2.54, 25.4))
|
||||
|
|
@ -1209,6 +1208,7 @@ def test_drill_ctor_validation():
|
|||
assert_raises(TypeError, Drill, (3,4,5), 5, None)
|
||||
|
||||
|
||||
|
||||
def test_drill_bounds():
|
||||
d = Drill((0, 0), 2, None)
|
||||
xbounds, ybounds = d.bounding_box
|
||||
|
|
@ -1223,7 +1223,7 @@ def test_drill_bounds():
|
|||
def test_drill_conversion():
|
||||
d = Drill((2.54, 25.4), 254., None, units='metric')
|
||||
|
||||
# No effect
|
||||
#No effect
|
||||
d.to_metric()
|
||||
assert_equal(d.position, (2.54, 25.4))
|
||||
assert_equal(d.diameter, 254.0)
|
||||
|
|
@ -1232,7 +1232,7 @@ def test_drill_conversion():
|
|||
assert_equal(d.position, (0.1, 1.0))
|
||||
assert_equal(d.diameter, 10.0)
|
||||
|
||||
# No effect
|
||||
#No effect
|
||||
d.to_inch()
|
||||
assert_equal(d.position, (0.1, 1.0))
|
||||
assert_equal(d.diameter, 10.0)
|
||||
|
|
|
|||
|
|
@ -39,10 +39,9 @@ def test_size_parameter():
|
|||
|
||||
|
||||
def test_conversion():
|
||||
import copy
|
||||
top_copper = read(TOP_COPPER_FILE)
|
||||
assert_equal(top_copper.units, 'inch')
|
||||
top_copper_inch = copy.deepcopy(top_copper)
|
||||
top_copper_inch = read(TOP_COPPER_FILE)
|
||||
top_copper.to_metric()
|
||||
for statement in top_copper_inch.statements:
|
||||
statement.to_metric()
|
||||
|
|
|
|||
|
|
@ -291,22 +291,22 @@ def rotate_point(point, angle, center=(0.0, 0.0)):
|
|||
`point` rotated about `center` by `angle` degrees.
|
||||
"""
|
||||
angle = radians(angle)
|
||||
|
||||
|
||||
cos_angle = cos(angle)
|
||||
sin_angle = sin(angle)
|
||||
|
||||
|
||||
return (
|
||||
cos_angle * (point[0] - center[0]) - sin_angle * (point[1] - center[1]) + center[0],
|
||||
sin_angle * (point[0] - center[0]) + cos_angle * (point[1] - center[1]) + center[1])
|
||||
|
||||
def nearly_equal(point1, point2, ndigits = 6):
|
||||
'''Are the points nearly equal'''
|
||||
|
||||
|
||||
return round(point1[0] - point2[0], ndigits) == 0 and round(point1[1] - point2[1], ndigits) == 0
|
||||
|
||||
|
||||
def sq_distance(point1, point2):
|
||||
|
||||
|
||||
diff1 = point1[0] - point2[0]
|
||||
diff2 = point1[1] - point2[1]
|
||||
return diff1 * diff1 + diff2 * diff2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue