Removed v2 at end of filenames

pi/main2.py → pi/main.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """
 Authors: Nicholas Sanders & Humphrey Shotton
-Filename: main2.py
+Filename: main.py
 Version: 2.1 [2014/03/27]
 
 Main application. Two threads are created, one to deal with GUI and inputs, and

pi/pipark_setup.py

@@ -16,9 +16,9 @@
 from PIL import Image, ImageTk
 
 import imageread
-import main2
+import main
 import data.settings as s
-from setup_classes2 import ParkingSpace, Boxes
+from setup_classes import ParkingSpace, Boxes
 from ToggleButton import ToggleButton
 
 # ==============================================================================
@@ -208,9 +208,6 @@ def saveData(self):
     #   Load Data
     # --------------------------------------------------------------------------        
     def loadData(self):
-        # TODO: implement set methods in setup_classes2.py to set data loaded
-        # from setup_data.py
-
         try:
             # load the setup data, reload to refresh the data
             import setup_data 
@@ -576,7 +573,7 @@ def clickStart(self):
 
             self.quit_button.invoke()
             if self.__is_verbose: print "INFO: Setup application terminated. "
-            main2.main()
+            main.main()
 
     def clickRegister(self):
         """Register the car park with the server. """

pi/setup_classes2.py → pi/setup_classes.py

@@ -1,6 +1,6 @@
 """
-setup_classes2.py
-Update of setup_classes.py to work with new GUI.
+setup_classes.py
+Update of original setup_classes.py to work with new GUI.
 
 Author: Humphrey Shotton and Nicholas Sanders
 Version: 2.0 [2014/03/23]
@@ -368,7 +368,7 @@ def __init__(self, canvas, type = 0):
             self.current_box = 0
             self.boxes = [ControlPoint(j, canvas) for j in range(self.MAX_CPS)]
         else:
-            print "ERROR: setup_classes2.Boxes requires type 0 or 1."
+            print "ERROR: setup_classes.Boxes requires type 0 or 1."
         return
 
     #@staticmethod