[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/03 04:11:45

Modified files:
        gfx/demo       : psyko2.py 

Log message:
        better logging

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

Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.3 gzz/gfx/demo/psyko2.py:1.4
*** gzz/gfx/demo/psyko2.py:1.3  Mon Sep  2 13:46:37 2002
--- gzz/gfx/demo/psyko2.py      Tue Sep  3 04:11:45 2002
***************
*** 50,56 ****
  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))
--- 50,60 ----
  for i in range(0, len(tex0)):
      words[tex0[i]] = "(" + str(i) + ")"
      
! for seed in tex1: words[seed] = "----"
! 
! seen = {}
! for seed in tex0 + tex1: seen[seed] = None
! 
  
  log("textures0 seed: " + str(seed0))
  log("textures0: " + js(tex0))
***************
*** 154,160 ****
      def prepareNextTrial(self):
          if self.trial < len(self.list):
              self.seed = self.list[self.trial]
!             if self.seed in tex0:
                  self.correct = "old"
              else:
                  self.correct = "new"
--- 158,165 ----
      def prepareNextTrial(self):
          if self.trial < len(self.list):
              self.seed = self.list[self.trial]
!             #if self.seed in tex0:
!             if seen[self.seed] != None:
                  self.correct = "old"
              else:
                  self.correct = "new"
***************
*** 168,175 ****
                  self.prepareNextTrial()
                  
              #setTimeout(self, 5000)
              self.trial = self.trial + 1
!             log("Trial %(trial)s: %(seed)s" % vars(self))
              self.reactstart = System.currentTimeMillis()
          else:
              currentScene = MenuScene()
--- 173,186 ----
                  self.prepareNextTrial()
                  
              #setTimeout(self, 5000)
+             if seen[self.seed] != None:
+                 self.seen = seen[self.seed] + 1
+             else:
+                 self.seen = None
              self.trial = self.trial + 1
!             self.word = words[self.seed]
!             log("Trial %(trial)s: %(seed)s %(word)s (seen at trial %(seen)s)"
!                 % vars(self))
              self.reactstart = System.currentTimeMillis()
          else:
              currentScene = MenuScene()
***************
*** 208,214 ****
          if self.state == 0:
              self.endTrial(None)
          else:
!             self.nextTrial()
  
      def start(self):
          global currentScene
--- 219,228 ----
          if self.state == 0:
              self.endTrial(None)
          else:
!             currentScene = FeedBackScene(self, 2, timeout = 500)
!             AbstractUpdateManager.setNoAnimation()
!             AbstractUpdateManager.chg()
!             #self.nextTrial()
  
      def start(self):
          global currentScene
***************
*** 228,239 ****
        print "Seed: ",self.seed," pq ",self.pq
        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
  
  
--- 242,254 ----
        print "Seed: ",self.seed," pq ",self.pq
        vs.map.put(self.pq, cs1, cs2)
  
!         seen[self.seed] = self.trial
  
+         if self.state == 1:
+             cs1 = vs.coords.affineCoordsys("msg", 10, 570, 450, 1, 0, 0, 1)
+             putText(vs, cs1, words[self.seed], color=(0,0,0))
+             #self.prepareNextTrial()
+             
        return vs