[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx/demo psyko2.py
From: |
Janne V. Kujala |
Subject: |
[Gzz-commits] gzz/gfx/demo psyko2.py |
Date: |
Mon, 02 Sep 2002 11:01:40 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Janne V. Kujala <address@hidden> 02/09/02 11:01:40
Modified files:
gfx/demo : psyko2.py
Log message:
Fix text
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/psyko2.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/psyko2.py
diff -c gzz/gfx/demo/psyko2.py:1.1 gzz/gfx/demo/psyko2.py:1.2
*** gzz/gfx/demo/psyko2.py:1.1 Mon Sep 2 10:53:49 2002
--- gzz/gfx/demo/psyko2.py Mon Sep 2 11:01:40 2002
***************
*** 157,163 ****
def nextTrial(self):
global currentScene
if self.trial < len(self.list):
! setTimeout(self, 5000)
self.trial = self.trial + 1
log("Trial %(trial)s: %(seed)s" % vars(self))
self.reactstart = System.currentTimeMillis()
--- 157,167 ----
def nextTrial(self):
global currentScene
if self.trial < len(self.list):
! if self.seed != self.list[self.trial]:
! print "WARNING: TRIAL NOT PREPARED"
! self.prepareNextTrial()
!
! #setTimeout(self, 5000)
self.trial = self.trial + 1
log("Trial %(trial)s: %(seed)s" % vars(self))
self.reactstart = System.currentTimeMillis()
***************
*** 182,189 ****
AbstractUpdateManager.setNoAnimation()
AbstractUpdateManager.chg()
- self.prepareNextTrial()
-
def key(self, k):
global currentScene
if self.state != 0: return
--- 186,191 ----
***************
*** 217,229 ****
pscale = zoom[0]
- if self.state == 1:
- print "Putting text: ", self.seed
- cs1 = vs.coords.affineCoordsys("msg", 10, 300, 450, 1, 0, 0, 1)
- putText(vs, cs1, str(self.seed), color=(1,1,1))
-
print "Seed: ",self.seed," pq ",self.pq
vs.map.put(self.pq, cs1, cs2)
return vs
--- 219,232 ----
pscale = zoom[0]
print "Seed: ",self.seed," pq ",self.pq
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
- [Gzz-commits] gzz/gfx/demo psyko2.py,
Janne V. Kujala <=