Add Better Layer Support

.gitignore

@@ -1,3 +1,7 @@
 *~
 .*.sw?
 *.pyc
+build
+dist
+svg2mod.egg-info
+*.kicad_mod

.travis.yml

@@ -0,0 +1,2 @@
+language: python
+script: pip3 install ./ && svg2mod -i examples/dt-logo.svg -o output.kicad_mod --name TEST --value VALUE -f 2 -p 1 --format pretty --units mm -d 300 --center

README.md

@@ -1,11 +1,27 @@
 # svg2mod
-This is a small program to convert Inkscape SVG drawings to KiCad footprint module files.  It uses [cjlano's python SVG parser and drawing module](https://github.com/cjlano/svg) to interpret drawings and approximate curves using straight line segments.  Module files can be output in KiCad's legacy or s-expression (i.e., pretty) formats.  Horizontally mirrored modules are automatically generated for use on the back of a 2-layer PCB.
+[![Build Status](https://travis-ci.org/Sodium-Hydrogen/svg2mod.svg?branch=master)](https://travis-ci.org/Sodium-Hydrogen/svg2mod)
+
+This is a small program to convert Inkscape SVG drawings to KiCad footprint module files.  It uses [cjlano's python SVG parser and drawing module](https://github.com/cjlano/svg) to interpret drawings and approximate curves using straight line segments.  Module files can be output in KiCad's legacy or s-expression (i.e., pretty) formats.
+
+## Requirements
+
+Python 3
+
+## Installation
+
+```pip3 install git+https://github.com/Sodium-Hydrogen/svg2mod```
+
+If building fails make sure setuptools is up to date. `pip3 install setuptools --upgrade`
+
+## Example
+
+```svg2mod -i input.svg -p 1.0```
 
 ## Usage
 ```
-usage: svg2mod.py [-h] -i FILENAME [-o FILENAME] [--name NAME] [--value VALUE]
-                  [-f FACTOR] [-p PRECISION] [-d DPI] [--front-only] [--format FORMAT]
-                  [--units UNITS]
+usage: svg2mod [-h] -i FILENAME [-o FILENAME] [--name NAME] [--value VALUE]
+               [-f FACTOR] [-p PRECISION] [--format FORMAT] [--units UNITS]
+               [-d DPI] [--center]
 
 Convert Inkscape SVG drawings to KiCad footprint modules.
 
@@ -24,10 +40,10 @@ optional arguments:
   -p PRECISION, --precision PRECISION
                         smoothness for approximating curves with line segments
                         (float)
-  -d DPI, --dpi DPI     DPI of the SVG file (int)
-  --front-only          omit output of back module (legacy output format)
   --format FORMAT       output module file format (legacy|pretty)
   --units UNITS         output units, if output format is legacy (decimil|mm)
+  -d DPI, --dpi DPI     DPI of the SVG file (int)
+  --center              Center the module to the center of the bounding box
 ```
 
 ## SVG Files
@@ -39,9 +55,7 @@ svg2mod expects images saved in the uncompressed Inkscape SVG (i.e., not "plain
    * A path may have holes, defined by interior segments within the path (see included examples).  Sometimes this will render propery in KiCad, but sometimes not.
    * Paths with filled areas within holes may not work at all.
  * Groups may be used.  However, styles applied to groups (e.g., stroke-width) are not applied to contained drawing elements.  In these cases, it may be necessary to ungroup (and perhaps regroup) the elements.
- * Layers must be used to indicate the mapping of drawing elements to KiCad layers.
-   * Layers must be named according to the rules below.
-   * Drawing elements will be mapped to front layers by default.  Mirrored images of these elements can be automatically generated and mapped to back layers in a separate module (see --front-only option).
+ * Layers must be named according to the rules below.
  * Other types of elements such as rect, arc, and circle are not supported.
    * Use Inkscape's "Path->Object To Path" and "Path->Stroke To Path" menu options to convert these elements into paths that will work.
 
@@ -50,17 +64,24 @@ Layers must be named (case-insensitive) according to the following rules:
 
 | Inkscape layer name | KiCad layer(s)   | KiCad legacy | KiCad pretty |
 |:-------------------:|:----------------:|:------------:|:------------:|
-| Cu                  | F.Cu, B.Cu       | Yes          | Yes          |
-| Adhes               | F.Adhes, B.Adhes | Yes          | Yes          |
-| Paste               | F.Paste, B.Paste | Yes          | Yes          |
-| SilkS               | F.SilkS, B.SilkS | Yes          | Yes          |
-| Mask                | F.Mask, B.Mask   | Yes          | Yes          |
-| Dwgs.User           | Dwgs.User        | Yes          | --           |
-| Cmts.User           | Cmts.User        | Yes          | --           |
-| Eco1.User           | Eco1.User        | Yes          | --           |
-| Eco2.User           | Eco2.User        | Yes          | --           |
+| F.Cu                | F.Cu             | Yes          | Yes          |
+| B.Cu                | B.Cu             | Yes          | Yes          |
+| F.Adhes             | F.Adhes          | Yes          | Yes          |
+| B.Adhes             | B.Adhes          | Yes          | Yes          |
+| F.Paste             | F.Paste          | Yes          | Yes          |
+| B.Paste             | B.Paste          | Yes          | Yes          |
+| F.SilkS             | F.SilkS          | Yes          | Yes          |
+| B.SilkS             | B.SilkS          | Yes          | Yes          |
+| F.Mask              | F.Mask           | Yes          | Yes          |
+| B.Mask              | B.Mask           | Yes          | Yes          |
+| Dwgs.User           | Dwgs.User        | Yes          | Yes          |
+| Cmts.User           | Cmts.User        | Yes          | Yes          |
+| Eco1.User           | Eco1.User        | Yes          | Yes          |
+| Eco2.User           | Eco2.User        | Yes          | Yes          |
 | Edge.Cuts           | Edge.Cuts        | Yes          | Yes          |
-| Fab                 | F.Fab, B.Fab     | --           | Yes          |
-| CrtYd               | F.CrtYd, B.CrtYd | --           | Yes          |
+| F.Fab               | F.Fab            | --           | Yes          |
+| B.Fab               | B.Fab            | --           | Yes          |
+| F.CrtYd             | F.CrtYd          | --           | Yes          |
+| B.CrtYd             | B.CrtYd          | --           | Yes          |
 
-Note: If you have a layer "Cu", all of its sub-layers will be treated as "Cu" regardless of their names.
+Note: If you have a layer "F.Cu", all of its sub-layers will be treated as "F.Cu" regardless of their names.

setup.py

@@ -25,9 +25,9 @@
     version='0.1.0',
     description="Convert an SVG file to a KiCad footprint.",
     long_description=readme,
-    author='https://github.com/mtl',
+    author='https://github.com/Sodium-Hydrogen',
     author_email='',
-    url='https://github.com/mtl/svg2mod',
+    url='https://github.com/Sodium-Hydrogen/svg2mod',
     packages=setuptools.find_packages(),
     entry_points={'console_scripts':['svg2mod = svg2mod.svg2mod:main']},
     package_dir={'svg2mod':'svg2mod'},

svg2mod/svg/svg/svg.py

@@ -258,11 +258,10 @@ class Group(Transformable):
 
     def __init__(self, elt=None):
         Transformable.__init__(self, elt)
-        
+
         self.name = ""
         if elt is not None:
-
-            for id, value in elt.attrib.iteritems():
+            for id, value in elt.attrib.items():
 
                 id = self.parse_name( id )
                 if id[ "name" ] == "label":
@@ -401,7 +400,7 @@ def parse(self, pathstr):
             # Close Path
                 l = Segment(current_pt, start_pt)
                 self.items.append(l)
-
+                current_pt = start_pt
 
             elif command in 'LHV':
             # LineTo, Horizontal & Vertical line
@@ -708,4 +707,3 @@ def default(self, obj):
     tag = getattr(cls, 'tag', None)
     if tag:
         svgClass[svg_ns + tag] = cls
-