added ExcellonFile class

1 files changed, 87 insertions, 46 deletions

diff --git a/gerber/excellon.py b/gerber/excellon.py
index fef5844..d92d57c 100755
--- a/gerber/excellon.py
+++ b/gerber/excellon.py
@@ -2,19 +2,60 @@
 import re

 from itertools import tee, izip

 from .utils import parse_gerber_value

-    

-    

-INCH = 0

-METRIC = 1

 

-ABSOLUTE = 0

-INCREMENTAL = 1

 

-LZ = 0

-TZ = 1

+def read(filename):

+    """ Read data from filename and return an ExcellonFile

+    """

+    return ExcellonParser().parse(filename)

 

-class Tool(object):

 

+class ExcellonFile(object):

+    """ A class representing a single excellon file

+

+    The ExcellonFile class represents a single excellon file.

+

+    Parameters

+    ----------

+    tools : list

+        list of gerber file statements

+

+    hits : list of tuples

+        list of drill hits as (<Tool>, (x, y))

+    settings : dict

+        Dictionary of gerber file settings

+

+    filename : string

+        Filename of the source gerber file

+

+    Attributes

+    ----------

+    units : string

+        either 'inch' or 'metric'.

+

+    """

+    def __init__(self, tools, hits, settings, filename):

+        self.tools = tools

+        self.hits = hits

+        self.settings = settings

+        self.filename = filename

+

+    def report(self):

+        """ Print drill report

+        """

+        pass

+

+    def render(self, filename, ctx):

+        """ Generate image of file

+        """

+        for tool, pos in self.hits:

+            ctx.drill(pos[0], pos[1], tool.diameter)

+        ctx.dump(filename)

+

+

+class Tool(object):

+    """ Excellon Tool class

+    """

     @classmethod

     def from_line(cls, line, settings):

         commands = re.split('([BCFHSTZ])', line)[1:]

@@ -38,7 +79,7 @@ class Tool(object):
             elif cmd == 'Z':

                 args['depth_offset'] = parse_gerber_value(val, format, zero_suppression)

         return cls(settings, **args)

-        

+

     def __init__(self, settings, **kwargs):

         self.number = kwargs.get('number')

         self.feed_rate = kwargs.get('feed_rate')

@@ -47,79 +88,83 @@ class Tool(object):
         self.diameter = kwargs.get('diameter')

         self.max_hit_count = kwargs.get('max_hit_count')

         self.depth_offset = kwargs.get('depth_offset')

-        self.units = settings.get('units', INCH)

-        

+        self.units = settings.get('units', 'inch')

+

     def __repr__(self):

-        unit = 'in.' if self.units == INCH else 'mm'

+        unit = 'in.' if self.units == 'inch' else 'mm'

         return '<Tool %d: %0.3f%s dia.>' % (self.number, self.diameter, unit)

-        

 

 

 class ExcellonParser(object):

     def __init__(self, ctx=None):

-        self.ctx=ctx

+        self.ctx = ctx

         self.notation = 'absolute'

         self.units = 'inch'

         self.zero_suppression = 'trailing'

-        self.format = (2,5)

+        self.format = (2, 5)

         self.state = 'INIT'

-        self.tools = {}

+        self.tools = []

         self.hits = []

         self.active_tool = None

         self.pos = [0., 0.]

         if ctx is not None:

-            self.ctx.set_coord_format(zero_suppression='trailing', format=[2,5], notation='absolute')

+            self.ctx.set_coord_format(zero_suppression='trailing',

+                                      format=(2, 5), notation='absolute')

+

     def parse(self, filename):

         with open(filename, 'r') as f:

             for line in f:

                 self._parse(line)

-    

+        settings = {'notation': self.notation, 'units': self.units,

+                    'zero_suppression': self.zero_suppression,

+                    'format': self.format}

+        return ExcellonFile(self.tools, self.hits, settings, filename)

+

     def dump(self, filename):

         self.ctx.dump(filename)

-        

+

     def _parse(self, line):

         if 'M48' in line:

             self.state = 'HEADER'

-        

+

         if 'G00' in line:

             self.state = 'ROUT'

-        

+

         if 'G05' in line:

             self.state = 'DRILL'

-        

+

         elif line[0] == '%' and self.state == 'HEADER':

             self.state = 'DRILL'

-        

+

         if 'INCH' in line or line.strip() == 'M72':

-            self.units = 'INCH'

-            

+            self.units = 'inch'

+

         elif 'METRIC' in line or line.strip() == 'M71':

-            self.units = 'METRIC'

-            

+            self.units = 'metric'

+

         if 'LZ' in line:

             self.zeros = 'L'

-            

+

         elif 'TZ' in line:

             self.zeros = 'T'

 

         if 'ICI' in line and 'ON' in line or line.strip() == 'G91':

             self.notation = 'incremental'

-            

+

         if 'ICI' in line and 'OFF' in line or line.strip() == 'G90':

             self.notation = 'incremental'

-        

+

         zs = self._settings()['zero_suppression']

         fmt = self._settings()['format']

-        

+

         # tool definition

         if line[0] == 'T' and self.state == 'HEADER':

-            tool = Tool.from_line(line,self._settings())

+            tool = Tool.from_line(line, self._settings())

             self.tools[tool.number] = tool

-            

+

         elif line[0] == 'T' and self.state != 'HEADER':

             self.active_tool = self.tools[int(line.strip().split('T')[1])]

 

-            

         if line[0] in ['X', 'Y']:

             x = None

             y = None

@@ -127,10 +172,9 @@ class ExcellonParser(object):
                 splitline = line.strip('X').split('Y')

                 x = parse_gerber_value(splitline[0].strip(), fmt, zs)

                 if len(splitline) == 2:

-                    y = parse_gerber_value(splitline[1].strip(), fmt,zs)

+                    y = parse_gerber_value(splitline[1].strip(), fmt, zs)

             else:

-                y = parse_gerber_value(line.strip(' Y'), fmt,zs)

-            

+                y = parse_gerber_value(line.strip(' Y'), fmt, zs)

             if self.notation == 'absolute':

                 if x is not None:

                     self.pos[0] = x

@@ -146,20 +190,17 @@ class ExcellonParser(object):
                 if self.ctx is not None:

                     self.ctx.drill(self.pos[0], self.pos[1],

                                    self.active_tool.diameter)

-            

+

     def _settings(self):

-        return {'units':self.units, 'zero_suppression':self.zero_suppression,

+        return {'units': self.units, 'zero_suppression': self.zero_suppression,

                 'format': self.format}

-        

+

+

 def pairwise(iterator):

     itr = iter(iterator)

     while True:

         yield tuple([itr.next() for i in range(2)])

-        

+

 if __name__ == '__main__':

-    tools = []

-    settings = {'units':INCH, 'zeros':LZ}

     p = parser()

     p.parse('examples/ncdrill.txt')

-            

-            
\ No newline at end of file