[Gzz-commits] gzz/gfx/demo psyko2.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/02 13:46:37

Modified files:
        gfx/demo       : psyko2.py 

Log message:
        Show texture numbers as feedback

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.2 gzz/gfx/demo/psyko2.py:1.3
*** gzz/gfx/demo/psyko2.py:1.2  Mon Sep  2 11:01:40 2002
--- gzz/gfx/demo/psyko2.py      Mon Sep  2 13:46:37 2002
***************
*** 14,20 ****
  numtex0  = 50  # Number of different "old" textures
  numtex1  = 250  # Number of different "new" textures
  
! duration0 = 3000 # How long to show each of the "old" textures
  
  colorfeedback = 0 # Show green/red color for correct/incorrect
  
--- 14,20 ----
  numtex0  = 50  # Number of different "old" textures
  numtex1  = 250  # Number of different "new" textures
  
! feedbackduration = 1500
  
  colorfeedback = 0 # Show green/red color for correct/incorrect
  
***************
*** 46,51 ****
--- 46,57 ----
      if dupes(tex0 + tex1): continue
      break
  
+ words = {}
+ for i in range(0, len(tex0)):
+     words[tex0[i]] = "(" + str(i) + ")"
+     
+ for seed in tex1: words[seed] = "-"
+ 
  log("textures0 seed: " + str(seed0))
  log("textures0: " + js(tex0))
  
***************
*** 182,188 ****
              currentScene = FeedBackScene(self, 2) 
  
          self.state = 1
!         setTimeout(self, 1000)
          AbstractUpdateManager.setNoAnimation()
          AbstractUpdateManager.chg()
  
--- 188,194 ----
              currentScene = FeedBackScene(self, 2) 
  
          self.state = 1
!         setTimeout(self, feedbackduration)
          AbstractUpdateManager.setNoAnimation()
          AbstractUpdateManager.chg()
  
***************
*** 223,231 ****
        vs.map.put(self.pq, cs1, cs2)
  
          if self.state == 1:
!             print "Putting text: ", self.seed
!             cs1 = vs.coords.affineCoordsys("msg", 10, 400, 450, 1, 0, 0, 1)
!             putText(vs, cs1, str(self.seed), color=(0,0,0))
              self.prepareNextTrial()
  
        return vs
--- 229,237 ----
        vs.map.put(self.pq, cs1, cs2)
  
          if self.state == 1:
!             print "Putting text: ", words[self.seed]
!             cs1 = vs.coords.affineCoordsys("msg", 10, 500, 450, 1, 0, 0, 1)
!             putText(vs, cs1, words[self.seed], color=(0,.5,0))
              self.prepareNextTrial()
  
        return vs