Fixed bug with global variables; fixing logging filenames; set initia…

…lize_delay of scripts to 0
expyriment · Nov 15, 2013 · 33a6aad · 33a6aad
1 parent f8229fe
commit 33a6aad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/fonts/FreeMono.ttf b/fonts/FreeMono.ttf
diff --git a/fonts/FreeSans.ttf b/fonts/FreeSans.ttf
diff --git a/main.py b/main.py
@@ -1,14 +1,15 @@
+import sys
 import os
 import glob
 
+import pygame
 import expyriment
 import android
 
 
-android.init()
-android.map_key(android.KEYCODE_BACK, pygame.K_ESCAPE)
-
 def main():
+    android.init()
+
     projects = {}
     for folder in glob.glob("/mnt/*"):
         if os.path.isdir(folder):
@@ -44,9 +45,9 @@ def main():
     aliases = (
         ('monospace', 'misc-fixed', 'courier', 'couriernew', 'console',
          'fixed', 'mono', 'freemono', 'bitstreamverasansmono',
-         'verasansmono', 'monotype', 'lucidaconsole', 'droidsansmono),
+         'verasansmono', 'monotype', 'lucidaconsole', 'droidsansmono'),
         ('sans', 'arial', 'helvetica', 'swiss', 'freesans',
-         'bitstreamverasans', 'verasans', 'verdana', 'tahoma', 'droidsans),
+         'bitstreamverasans', 'verasans', 'verdana', 'tahoma', 'droidsans'),
         ('serif', 'times', 'freeserif', 'bitstreamveraserif', 'roman',
          'timesroman', 'timesnewroman', 'dutch', 'veraserif',
          'georgia', 'droidserif'),
@@ -82,8 +83,10 @@ def main():
                                       scroll_menu=5, mouse=mouse)
         py_file = projects[menu.get()]
         expyriment.control.defaults.event_logging = 1
+        expyriment.control.defaults.initialize_delay = 0
         os.chdir(os.path.split(py_file)[0])
-        execfile("{0}".format(py_file))
+        sys.argv[0] = py_file
+        execfile("{0}".format(py_file), globals())
 
 
 if __name__ == "__main__":