Fixed import statements based on new structure.

data_2013.py

@@ -1,21 +1,21 @@
 #!/usr/bin/env python2
 
-from scantron import Field
+from scantron import ScantronField
 
 data = [
-    Field('auton_high', 'Auton High', int),
-    Field('auton_mid', 'Auton Mid', int),
-    Field('auton_low', 'Auton Low', int),
-    Field('high', 'High', int),
-    Field('mid', 'Mid', int),
-    Field('low', 'Low', int),
-    Field('pyramid', 'Pyramid', int),
-    Field('missed', 'Missed', int),
-    Field('fouls', 'Fouls', int),
-    Field('tech_fouls', 'Tech fouls', int),
-    Field('defense', 'Defense', bool),
-    Field('pickup', 'Pickup', bool),
-    Field('noshow', 'Noshow', bool),
-    Field('brokedown', 'Brokedown', bool),
-    Field('dq', 'DQ', bool),
+    ScantronField('auton_high', 'Auton High', int),
+    ScantronField('auton_mid', 'Auton Mid', int),
+    ScantronField('auton_low', 'Auton Low', int),
+    ScantronField('high', 'High', int),
+    ScantronField('mid', 'Mid', int),
+    ScantronField('low', 'Low', int),
+    ScantronField('pyramid', 'Pyramid', int),
+    ScantronField('missed', 'Missed', int),
+    ScantronField('fouls', 'Fouls', int),
+    ScantronField('tech_fouls', 'Tech fouls', int),
+    ScantronField('defense', 'Defense', bool),
+    ScantronField('pickup', 'Pickup', bool),
+    ScantronField('noshow', 'Noshow', bool),
+    ScantronField('brokedown', 'Brokedown', bool),
+    ScantronField('dq', 'DQ', bool),
 ]

generate_pdf.py

@@ -3,7 +3,7 @@
 import os
 import sys
 from argparse import ArgumentParser
-from scantron import *
+from scantron import ScantronGenerator, inch
 
 # Make this file easier to use by adding nice arguments
 parser = ArgumentParser(description='Generate scantron PDFs.')
@@ -47,7 +47,7 @@
     quit(1)
 
 # If everything went well, proceed to generate the PDF
-st = Scantron(args.output, spacing=0.3*inch)
+st = ScantronGenerator(args.output, spacing=0.3*inch)
 st.set_box_sizes(box_size=0.2*inch, box_spacing=0.3*inch)
 st.populate(data, matches=args.num_matches, collate=args.collate)
 st.save()

testcase.py

@@ -1,30 +1,30 @@
 #!/usr/bin/env python2
 
-from scantron import *
+from scantron import ScantronGenerator, ScantronField, inch
 import PythonMagick
 from pyPdf import PdfFileReader
 from PIL import Image
 
-data = [
-    Field('foo', 'Foo foo foo', int),
-    Field('bar', 'Bar bar bar', int),
-    Field('baz', 'Baz baz baz', int),
-    Field('laber', 'Laber laber', bool),
+test_data = [
+    ScantronField('foo', 'Foo foo foo', int),
+    ScantronField('bar', 'Bar bar bar', int),
+    ScantronField('baz', 'Baz baz baz', int),
+    ScantronField('laber', 'Laber laber', bool),
 ]
 
-# Generate PDF
-st = Scantron('test.pdf')
-st.set_box_sizes(box_size=0.2*inch, box_spacing=0.3*inch)
-st.populate(data, matches=1, collate='no')
-st.save()
+# Generate scantron PDF
+pdf = ScantronGenerator('test.pdf')
+pdf.set_box_sizes(box_size=0.2*inch, box_spacing=0.3*inch)
+pdf.populate(test_data, matches=1, collate='no')
+pdf.save()
 
 # Convert PDF to a series of pictures
 pages = []
 
 pdf = PdfFileReader(file('test.pdf', 'rb'))
+num_pages = pdf.getNumPages()
 
-for page in range(pdf.getNumPages()):
-    #page += 1
+for page in range(num_pages):
     name = 'test_image_%d.png' % page
 
     im = PythonMagick.Image()