Changes in Feedbacks/Oddball/

Author: unknown

src/Feedbacks/Oddball/CheckerboardVEP.py

@@ -31,7 +31,7 @@ def init(self):
         super(CheckerboardVEP,self).init()
         self.dev_perc = 0.5
         self.nStim = 40
-        self.nStim_per_block = 100   # number of stimuli until a pause
+        self.nStim_per_block = 20   # number of stimuli until a pause
         self.dd_dist = 1
         self.squaresPerSide = 6
         self.response = 'none'

src/Feedbacks/Oddball/Oddball.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 
-# Q: - several standards and/or deviants (probabilities? e.g. std_prob = [0.2 0.5 0.3])
-#    - option give several markers
-#    - constraints (min. x standards between deviants)
-
 
 # ODDBALL BASE CLASS from which all the subclasses inherit.
 #
@@ -53,23 +49,22 @@
 import pygame
 
 from FeedbackBase.MainloopFeedback import MainloopFeedback
+from lib import marker
 
 class Oddball(MainloopFeedback):
 
-    RUN_START, RUN_END = 252,253
-    COUNTDOWN_START, COUNTDOWN_END = 40,41
     STANDARD, DEVIANT = list(),list()    
     # standards have markers 10,11,12,... ; deviants 30,31,32,... (cf. get_stimuli())
     # if self.group_stim_markers==True, then there exist only two markers, one for
     # group standard (10), and one for group deviant (20)
     RESP_STD, RESP_DEV = 1,2
-    SHORTPAUSE_START, SHORTPAUSE_END = 249, 250
 
     def init(self):        
         self.screen_pos = [100, 100, 640, 480]
+        self.fullscreen = False
         self.FPS = 40
-        self.nStim = 100
-        self.nStim_per_block = 50        
+        self.nStim = 10
+        self.nStim_per_block = 5        
         self.dev_perc = 0.1        
         self.countdown_from = 2
         self.show_standards = True
@@ -196,7 +191,7 @@ def pre_mainloop(self):
         Sets up all the necessary components (e.g. pygame, stimuli, graphics) 
         to run the experiment.
         """
-        self.send_parallel(self.RUN_START)
+        self.send_parallel(marker.RUN_START)
         self.init_pygame()
         self.get_stimuli()
         self.error_checking()
@@ -209,7 +204,7 @@ def post_mainloop(self):
         """
         Sends end marker to parallel port and quits pygame.
         """
-        self.send_parallel(self.RUN_END)
+        self.send_parallel(marker.RUN_END)
         pygame.quit()        
 
 
@@ -376,15 +371,15 @@ def short_pause_tick(self):
         One tick of the short pause loop.
         """
         if self.shortpauseElapsed == 0:
-            self.send_parallel(self.SHORTPAUSE_START)
+            self.send_parallel(marker.PAUSE_START)
 
         self.shortpauseElapsed += self.elapsed
 
         if self.shortpauseElapsed >= self.shortpauseDuration:
             self.shortpause = False
             self.shortpauseElapsed = 0
             self.countdown = True
-            self.send_parallel(self.SHORTPAUSE_END)
+            self.send_parallel(marker.PAUSE_END)
             return
 
         self.do_print("Short Break...", self.fontColor, self.size / 10)
@@ -396,7 +391,7 @@ def countdown_tick(self):
         """        
         # start countdown
         if self.countdownElapsed == 0:
-            self.send_parallel(self.COUNTDOWN_START)
+            self.send_parallel(marker.COUNTDOWN_START)
             self.draw_initial()
             # initialize stimulus sequence for the next block according to the deviant probability
             n = min(self.nStim_per_block,self.nStim)
@@ -406,7 +401,7 @@ def countdown_tick(self):
 
         # stop countdown
         if self.countdownElapsed >= (self.countdown_from) * 1000:
-            self.send_parallel(self.COUNTDOWN_END)
+            self.send_parallel(marker.COUNTDOWN_END)
             self.countdown = False
             self.countdownElapsed = 0
             self.beforestim = True               
@@ -515,7 +510,10 @@ def init_pygame(self):
         os.environ['SDL_VIDEO_WINDOW_POS'] = "%d,%d" % (self.screen_pos[0], self.screen_pos[1])        
         pygame.init()
         pygame.display.set_caption('Oddball')
-        self.screen = pygame.display.set_mode((self.screen_pos[2], self.screen_pos[3]), pygame.RESIZABLE)
+        if self.fullscreen:
+            self.screen = pygame.display.set_mode((self.screen_pos[2], self.screen_pos[3]), pygame.FULLSCREEN)
+        else:
+            self.screen = pygame.display.set_mode((self.screen_pos[2], self.screen_pos[3]), pygame.RESIZABLE)
         self.clock = pygame.time.Clock()
 
     def contrained_oddball_sequence(self, N, dev_perc, dd_dist=0):