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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/09/27 06:01:30

Modified files:
        gfx/demo       : papertest.py 

Log message:
        Fix paper zoom and MultiPaperScene coords's; putText is broken -- 
HorizText seems to ignore x and y

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

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.29 gzz/gfx/demo/papertest.py:1.30
*** gzz/gfx/demo/papertest.py:1.29      Thu Sep 26 14:39:24 2002
--- gzz/gfx/demo/papertest.py   Fri Sep 27 06:01:30 2002
***************
*** 81,88 ****
          print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Time of", iters, "renders:", 
t, "s"
  
  
! zoom = [100, 500, 650, 800, 2000]
! paperzoom = [2, 10, 33, 100]
  
  passmask = [1,1,1,1]
  
--- 81,90 ----
          print "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!Time of", iters, "renders:", 
t, "s"
  
  
! zoom = [100.0, 500.0, 650.0, 800.0, 2000.0]
! #paperzoom = [2, 10, 33, 100]
! #paperzoom = [0.2, 1, 3, 0.05]
! paperzoom = [100.0, 200.0, 400.0, 800.0]
  
  passmask = [1,1,1,1]
  
***************
*** 224,239 ****
        putnoc(vs, background(self.bgcolor))
  
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, "tex", 1, 400, 400, scale, 0, 0, 
scale)
  
          cs1 = range(0,self.w*self.h)
          for i in range(0,self.w*self.h):
              if i >= len(self.pq): break
!             cs1[i] = vs.coords.affineCoordsys(0, str(i), 100-i,
                                                (i%self.w+.5)*1200.0/self.w,
                                                (i/self.w+.5)*900.0/self.h,
                                                .47*1200.0/self.w, 0,
                                                0, .47*900.0/self.h)
              
              vs.map.put(self.pq[i], cs1[i], cs2)
              putText(vs, cs1[i], str(self.seed + i), color=(0,0,0), 
x=-1,y=1,z=-1,w=.01, h=.01)
--- 226,243 ----
        putnoc(vs, background(self.bgcolor))
  
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 400, 400, scale, 0, 0, scale)
!         vs.matcher.add(cs2, "tex")
  
          cs1 = range(0,self.w*self.h)
          for i in range(0,self.w*self.h):
              if i >= len(self.pq): break
!             cs1[i] = vs.coords.affineCoordsys(0, 100-i,
                                                (i%self.w+.5)*1200.0/self.w,
                                                (i/self.w+.5)*900.0/self.h,
                                                .47*1200.0/self.w, 0,
                                                0, .47*900.0/self.h)
+             vs.matcher.add(cs1[i], str(i))
              
              vs.map.put(self.pq[i], cs1[i], cs2)
              putText(vs, cs1[i], str(self.seed + i), color=(0,0,0), 
x=-1,y=1,z=-1,w=.01, h=.01)