- moved back the ApertureMacro class to camlib for now and made some import changes in the new ParseGerber and ParseExcellon classes

- some changes to the tests - perhaps I will try adding a few tests in the future

tests/other/test_excellon_1.py

@@ -8,12 +8,13 @@ Created on Sun Jan 05 13:30:47 2014
 import os
 os.chdir('../')
 
-from camlib import *
-#from matplotlib.figure import Figure
+from flatcamParsers.ParseGerber import *
+from flatcamParsers.ParseExcellon import *
+
 from matplotlib import pyplot
 
 # Gerber. To see if the Excellon is correct
-project_dir = "tests/"
+project_dir = "tests/gerber_files"
 gerber_filename = project_dir + "KiCad_Squarer-F_Cu.gtl"
 g = Gerber()
 g.parse_file(gerber_filename)
@@ -32,7 +33,7 @@ ax.set_aspect(1)
 # Plot gerber
 for geo in g.solid_geometry:
     x, y = geo.exterior.coords.xy
-    plot(x, y, 'k-')
+    pyplot.plot(x, y, 'k-')
     for ints in geo.interiors:
         x, y = ints.coords.xy
         ax.plot(x, y, 'k-')
@@ -40,7 +41,7 @@ for geo in g.solid_geometry:
 # Plot excellon
 for geo in ex.solid_geometry:
     x, y = geo.exterior.coords.xy
-    plot(x, y, 'r-')
+    pyplot.plot(x, y, 'r-')
     for ints in geo.interiors:
         x, y = ints.coords.xy
         ax.plot(x, y, 'g-')