Merge pull request #3 from garretfick/merge-curtacircuitos

Merge curtacircuitos

1 files changed, 164 insertions, 26 deletions

diff --git a/gerber/utils.py b/gerber/utils.py
index 7749e22..ef9c39e 100644
--- a/gerber/utils.py
+++ b/gerber/utils.py
@@ -23,8 +23,13 @@ This module provides utility functions for working with Gerber and Excellon
 files.
 """
 
-# Author: Hamilton Kibbe <ham@hamiltonkib.be>
-# License:
+import os
+from math import radians, sin, cos
+from operator import sub
+from copy import deepcopy
+from pyhull.convex_hull import ConvexHull
+
+MILLIMETERS_PER_INCH = 25.4
 
 
 def parse_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
@@ -50,7 +55,7 @@ def parse_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
         (number of integer-part digits, number of decimal-part digits)
 
     zero_suppression : string
-        Zero-suppression mode. May be 'leading' or 'trailing'
+        Zero-suppression mode. May be 'leading', 'trailing' or 'none'
 
     Returns
     -------
@@ -73,19 +78,22 @@ def parse_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
         raise ValueError('Parser only supports precision up to 6:7 format')
 
     # Remove extraneous information
-    #value = value.strip()
     value = value.lstrip('+')
     negative = '-' in value
     if negative:
         value = value.lstrip('-')
 
+    missing_digits = MAX_DIGITS - len(value)
 
-    digits = list('0' * MAX_DIGITS)
-    offset = 0 if zero_suppression == 'trailing' else (MAX_DIGITS - len(value))
-    for i, digit in enumerate(value):
-        digits[i + offset] = digit
+    if zero_suppression == 'trailing':
+        digits = list(value + ('0' * missing_digits))
+    elif zero_suppression == 'leading':
+        digits = list(('0' * missing_digits) + value)
+    else:
+        digits = list(value)
 
-    result = float(''.join(digits[:integer_digits] + ['.'] + digits[integer_digits:]))
+    result = float(
+        ''.join(digits[:integer_digits] + ['.'] + digits[integer_digits:]))
     return -result if negative else result
 
 
@@ -111,7 +119,7 @@ def write_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
         (number of integer-part digits, number of decimal-part digits)
 
     zero_suppression : string
-        Zero-suppression mode. May be 'leading' or 'trailing'
+        Zero-suppression mode. May be 'leading', 'trailing' or 'none'
 
     Returns
     -------
@@ -125,9 +133,10 @@ def write_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
     if MAX_DIGITS > 13 or integer_digits > 6 or decimal_digits > 7:
         raise ValueError('Parser only supports precision up to 6:7 format')
 
-    # Edge case...
+    # Edge case... (per Gerber spec we should return 0 in all cases, see page
+    # 77)
     if value == 0:
-        return '00'
+        return '0'
 
     # negative sign affects padding, so deal with it at the end...
     negative = value < 0.0
@@ -138,14 +147,22 @@ def write_gerber_value(value, format=(2, 5), zero_suppression='trailing'):
     fmtstring = '%%0%d.0%df' % (MAX_DIGITS + 1, decimal_digits)
     digits = [val for val in fmtstring % value if val != '.']
 
+    # If all the digits are 0, return '0'.
+    digit_sum = sum([int(digit) for digit in digits])
+    if digit_sum == 0:
+        return '0'
+
     # Suppression...
     if zero_suppression == 'trailing':
-        while digits[-1] == '0':
+        while digits and digits[-1] == '0':
             digits.pop()
-    else:
-        while digits[0] == '0':
+    elif zero_suppression == 'leading':
+        while digits and digits[0] == '0':
             digits.pop(0)
 
+    if not digits:
+        return '0'
+
     return ''.join(digits) if not negative else ''.join(['-'] + digits)
 
 
@@ -173,38 +190,159 @@ def decimal_string(value, precision=6, padding=False):
         integer, decimal = floatstr.split('.')
     elif ',' in floatstr:
         integer, decimal = floatstr.split(',')
+    else:
+        integer, decimal = floatstr, "0"
+
     if len(decimal) > precision:
         decimal = decimal[:precision]
     elif padding:
         decimal = decimal + (precision - len(decimal)) * '0'
+
     if integer or decimal:
         return ''.join([integer, '.', decimal])
     else:
         return int(floatstr)
 
 
-def detect_file_format(filename):
+def detect_file_format(data):
     """ Determine format of a file
 
     Parameters
     ----------
-    filename : string
-        Filename of the file to read.
+    data : string
+        string containing file data.
 
     Returns
     -------
     format : string
-        File format. either 'excellon' or 'rs274x'
+        File format. 'excellon' or 'rs274x' or 'unknown'
     """
-
-    # Read the first 20 lines
-    with open(filename, 'r') as f:
-        lines = [next(f) for x in xrange(20)]
-
-    # Look for
+    lines = data.split('\n')
     for line in lines:
         if 'M48' in line:
             return 'excellon'
         elif '%FS' in line:
-            return'rs274x'
+            return 'rs274x'
+        elif ((len(line.split()) >= 2) and
+              (line.split()[0] == 'P') and (line.split()[1] == 'JOB')):
+            return 'ipc_d_356'
     return 'unknown'
+
+
+def validate_coordinates(position):
+    if position is not None:
+        if len(position) != 2:
+            raise TypeError('Position must be a tuple (n=2) of coordinates')
+        else:
+            for coord in position:
+                if not (isinstance(coord, int) or isinstance(coord, float)):
+                    raise TypeError('Coordinates must be integers or floats')
+
+
+def metric(value):
+    """ Convert inch value to millimeters
+
+    Parameters
+    ----------
+    value : float
+        A value in inches.
+
+    Returns
+    -------
+    value : float
+        The equivalent value expressed in millimeters.
+    """
+    return value * MILLIMETERS_PER_INCH
+
+
+def inch(value):
+    """ Convert millimeter value to inches
+
+    Parameters
+    ----------
+    value : float
+        A value in millimeters.
+
+    Returns
+    -------
+    value : float
+        The equivalent value expressed in inches.
+    """
+    return value / MILLIMETERS_PER_INCH
+
+
+def rotate_point(point, angle, center=(0.0, 0.0)):
+    """ Rotate a point about another point.
+
+    Parameters
+    -----------
+    point : tuple(<float>, <float>)
+        Point to rotate about origin or center point
+
+    angle : float
+        Angle to rotate the point [degrees]
+
+    center : tuple(<float>, <float>)
+        Coordinates about which the point is rotated. Defaults to the origin.
+
+    Returns
+    -------
+    rotated_point : tuple(<float>, <float>)
+        `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
+
+
+def listdir(directory, ignore_hidden=True, ignore_os=True):
+    """ List files in given directory.
+    Differs from os.listdir() in that hidden and OS-generated files are ignored
+    by default.
+
+    Parameters
+    ----------
+    directory : str
+        path to the directory for which to list files.
+
+    ignore_hidden : bool
+        If True, ignore files beginning with a leading '.'
+
+    ignore_os : bool
+        If True, ignore OS-generated files, e.g. Thumbs.db
+
+    Returns
+    -------
+    files : list
+        list of files in specified directory
+    """
+    os_files = ('.DS_Store', 'Thumbs.db', 'ethumbs.db')
+    files = os.listdir(directory)
+    if ignore_hidden:
+        files = [f for f in files if not f.startswith('.')]
+    if ignore_os:
+        files = [f for f in files if not f in os_files]
+    return files
+
+
+def convex_hull(points):
+    vertices = ConvexHull(points).vertices
+    return [points[idx] for idx in
+            set([point for pair in vertices for point in pair])]