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

[Janne V. Kujala]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Janne V. Kujala <address@hidden>        02/10/11 10:03:13

Modified files:
        gfx/demo       : papertest.py 

Log message:
        cleanup

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

Patches:
Index: gzz/gfx/demo/papertest.py
diff -c gzz/gfx/demo/papertest.py:1.42 gzz/gfx/demo/papertest.py:1.43
*** gzz/gfx/demo/papertest.py:1.42      Fri Oct 11 08:17:47 2002
--- gzz/gfx/demo/papertest.py   Fri Oct 11 10:03:13 2002
***************
*** 1,7 ****
  from __future__ import nested_scopes
  
- from java.lang import Math
- 
  from types import ClassType
  
  # A jython test program for papers
--- 1,5 ----
***************
*** 85,95 ****
  
  passmask = [1,1,1,1]
  
! def getpaper(seed, w = 1):
!     pap = ThePaperMill().getPaper(seed, 
!       passmask=passmask)
      #print "Pq: ",seed
!     return GLRen.createPaperQuad(pap, -w, -1, +w, 1, 0)
  
  class PaperScene:
      def __init__(self):
--- 83,92 ----
  
  passmask = [1,1,1,1]
  
! def getpaper(seed):
!     pap = ThePaperMill().getPaper(seed, passmask=passmask)
      #print "Pq: ",seed
!     return GLRen.createPaperQuad(pap, -1, -1, +1, 1, 0)
  
  class PaperScene:
      def __init__(self):
***************
*** 114,120 ****
        self.pq = None
  
      def initpaper(self):
!         self.pq = getpaper(self.seed, w = 700.0/450)
  
      def key(self, k):
          oldseed = self.seed
--- 111,117 ----
        self.pq = None
  
      def initpaper(self):
!         self.pq = getpaper(self.seed)
  
      def key(self, k):
          oldseed = self.seed
***************
*** 127,141 ****
            self.initpaper()
            AbstractUpdateManager.setNoAnimation()
        if k == "v":
-           self.vec = (Math.random(), Math.random(), Math.random())
              self.seed = rng.nextInt(2000000000)
-       if k == "V":
-           t = self.t
-           x = 0.5+0.5*Math.cos(t)
-           y = 0.5+0.5*Math.sin(t*1.63)
-           self.vec = (x, y, 1-x-y)
-           self.t += 0.15
-           self.initpaper()
  
          if oldseed != self.seed:
            self.pq = None
--- 124,130 ----
***************
*** 144,149 ****
--- 133,140 ----
  
            
      def scene(self, vs):
+         size = vs.getSize()
+ 
        if not self.pq: self.initpaper()
        putnoc(vs, background(self.bgcolor))
  
***************
*** 159,167 ****
  
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
!       cs1 = vs.coords.affineCoordsys(0, 10, 700, 500, 450, 0, 0, 450)
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale / 450, 0, 0, scale / 
450)
  
        vs.matcher.add(cs1, "1")
        vs.matcher.add(cs2, "2")
--- 150,161 ----
  
        # vs.put(rectangle((1, 0.2, 0.4)), "re", 10, 100, 100, 300, 100)
  
!         w2 = .5 * size.width
!         h2 = .5 * size.height
! 
!       cs1 = vs.coords.affineCoordsys(0, 10, w2, h2, w2, 0, 0, h2)
        scale = zoom[0] / paperzoom[0]
!       cs2 = vs.coords.affineCoordsys(0, 0, 0, 0, scale / w2, 0, 0, scale / h2)
  
        vs.matcher.add(cs1, "1")
        vs.matcher.add(cs2, "2")
***************
*** 172,178 ****
        #print "Seed: ",self.seed," pq ",self.pq
        vs.map.put(self.pq, cs1, cs2)
  
!         putText(vs, cs1, str(self.seed), color=(0,0,0), x=-700/450.0, y=-1, 
h=.2)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
--- 166,175 ----
        #print "Seed: ",self.seed," pq ",self.pq
        vs.map.put(self.pq, cs1, cs2)
  
!       cs3 = vs.coords.affineCoordsys(0, 0, 0, 0, h2, 0, 0, h2)
!       vs.matcher.add(cs3, "txt")
! 
!         putText(vs, cs3, str(self.seed), color=(0,0,0), x=0, y=.12, h=.2)
  
        if self.renderPaper:
            putnoc(vs, getDList("""
***************
*** 237,249 ****
            self.initpaper()
            AbstractUpdateManager.setNoAnimation()
            AbstractUpdateManager.chg()
  
      def scene(self, vs):
        putnoc(vs, background(self.bgcolor))
  
  
!         cs1w = .47*1200.0/self.w
!         cs1h = .47*900.0/self.h
  
        scale = zoom[0] / paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/cs1w, 0, 0, scale/cs1h)
--- 234,252 ----
            self.initpaper()
            AbstractUpdateManager.setNoAnimation()
            AbstractUpdateManager.chg()
+         dw,dh = 0,0
+         if k == "+": dw,dh = [ (0,1), (1,0) ][self.w * 3 < self.h * 4]
+         if k == "-": dw,dh = [ (-1,0), (0,-1) ][self.w * 3 < self.h * 4]
+         self.w += dw
+         self.h += dh
  
      def scene(self, vs):
+         size = vs.getSize()
        putnoc(vs, background(self.bgcolor))
  
  
!         cs1w = .47*size.width/self.w
!         cs1h = .47*size.height/self.h
  
        scale = zoom[0] / paperzoom[0]
        cs2 = vs.coords.affineCoordsys(0, 1, 0, 0, scale/cs1w, 0, 0, scale/cs1h)
***************
*** 254,261 ****
          for i in range(0,self.w*self.h):
              if i >= len(self.pq): break
  
!             x = (i%self.w+.5)*1200.0/self.w
!             y = (i/self.w+.5)*900.0/self.h
  
              self.boxes.append( (x - cs1w, y - cs1h,
                                  x + cs1w, y + cs1h ) )
--- 257,264 ----
          for i in range(0,self.w*self.h):
              if i >= len(self.pq): break
  
!             x = (i%self.w+.5)*size.width/self.w
!             y = (i/self.w+.5)*size.height/self.h
  
              self.boxes.append( (x - cs1w, y - cs1h,
                                  x + cs1w, y + cs1h ) )