[Gzz-commits] gzz/gfx/util papersampler.py

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        03/03/05 05:16:59

Modified files:
        gfx/util       : papersampler.py 

Log message:
        adjust

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/papersampler.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: gzz/gfx/util/papersampler.py
diff -u gzz/gfx/util/papersampler.py:1.24 gzz/gfx/util/papersampler.py:1.25
--- gzz/gfx/util/papersampler.py:1.24   Wed Mar  5 02:59:45 2003
+++ gzz/gfx/util/papersampler.py        Wed Mar  5 05:16:59 2003
@@ -43,7 +43,7 @@
 xs = 1280
 ys = 960
 
-zoomLevels = [1.6, 2.4, 4]
+zoomLevels = [1.67, 2.4, 4]
 
 class OptMill(gzz.gfx.gl.PaperMill):
     def __init__(self, mill, opts):
@@ -133,8 +133,8 @@
         opts = pureConds[cond]
        for i in range(0,old + new):
             seed = 12345 + i
-           doFrame(lambda vs: paperscene(vs, seed, opts), 
-                    "tmp/tmp_%s_%02d" % (test, i))
+           #doFrame(lambda vs: paperscene(vs, seed, opts), 
+            #        "tmp/tmp_%s_%02d" % (test, i))
 
         for subj in range(0, 10):
             f = open("tmp/trials_%s_%s.txt" % (test, subj), "w")
@@ -179,7 +179,7 @@
     from gfx.demo import fontfilter2
     trials = len(pages) * 2
     
-    for subj in range(0,2):
+    for subj in range(0,3):
        global textureSeeds
        rng.shuffle(textureSeeds)
 
@@ -211,7 +211,6 @@
 
            file = "tmp/tmp_%s_%s_%02d" % (test, subj, trial)
 
-
            sc = fontfilter2.Scene()
            sc.scale = opts["zoom"]
            sc.halo = opts["halo"]
@@ -236,7 +235,12 @@
 
             f.write("tmp/star.mipzip 0 1000\n\n")
             f.write(file + ".mipzip 1000 60000 Space\n")
-            f.write("page=%s conds=%s\n" % (pagenums[trial], str(opts)))
+            f.write("page %s texture %s zoom %s type %s conds %s\n" %
+                    (pagenums[trial],
+                     textureSeeds[pagenums[trial]],
+                     opts["zoom"],
+                     int(opts["halo"] + 2 * opts["paperopts"].get("blend",0)),
+                     str(opts)))
             f.flush()
 
         f.close()