[Gzz-commits] gzz gfx/demo/gldemo.py gfx/demo/xupdf.py gzz/vi...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/02 14:24:35

Modified files:
        gfx/demo       : gldemo.py xupdf.py 
        gzz/view       : pagespanview.py 

Log message:
        Fix painting

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/gldemo.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/gldemo.py
diff -c gzz/gfx/demo/gldemo.py:1.29 gzz/gfx/demo/gldemo.py:1.30
*** gzz/gfx/demo/gldemo.py:1.29 Wed Oct  2 12:59:39 2002
--- gzz/gfx/demo/gldemo.py      Wed Oct  2 14:24:34 2002
***************
*** 206,211 ****
--- 206,213 ----
  def globalkey(k):
      pass
  
+ replacingScene = None
+ 
  class Bindings(AbstractBinder):
      def keystroke(self, s):
        print "KEY: '%s'"%s
***************
*** 235,245 ****
        if not currentScene:
            print "No scene\n"
            return vs
!       nvs = currentScene.scene(vs)
!       if nvs: vs = nvs
        return vs
  
! 
  
  class Main(Runnable):
      def run(self):
--- 237,255 ----
        if not currentScene:
            print "No scene\n"
            return vs
!       global replacingScene
!       if replacingScene:
!           vs = replacingScene
!           replacingScene = None
!       else:
!           currentScene.scene(vs)
        return vs
  
! def replaceNewScene(vs):
!     global replacingScene
!     AbstractUpdateManager.setNoAnimation()
!     replacingScene = vs
!     
  
  class Main(Runnable):
      def run(self):
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.40 gzz/gfx/demo/xupdf.py:1.41
*** gzz/gfx/demo/xupdf.py:1.40  Wed Oct  2 12:59:39 2002
--- gzz/gfx/demo/xupdf.py       Wed Oct  2 14:24:34 2002
***************
*** 263,295 ****
      """)
      selectPaperQuad = GLRen.createPaperQuad(selectPaper, -1,-1,1,1, 1)
  
  
  class XuPDFScene_PDFContext:
      def __init__(self):
!       self.mag = [(screensize[1]*1.6,screensize[1]/10),
!                       (screensize[1],screensize[1])]
        self.ctrx = screensize[0]/2
        self.ctry = screensize[1]/2
        self.rad = screensize[1]/2
        self.nadir = NadirAngler(self.ctrx, screensize[1]*2)
-       self.showcontext = 1
        self.clip = 0
        self.selectCS = None
        self.currentvs = None
      def key(self, key):
        global currentScene
-       if key == 'z':
-           currentScene = XuPDFScene_PDFZoom()
-           self.currentvs = None
        if key == 'm':
!           rotatelist(self.mag)
!           self.currentvs = None
        if key == 'c':
            self.clip = not self.clip
-           self.currentvs = None
-       if key == 's':
-           self.showcontext = not self.showcontext
-           self.currentvs = None
      def mouse(self, ev):
        global globalx, globaly
        if ev.getID() == ev.MOUSE_CLICKED:
--- 263,308 ----
      """)
      selectPaperQuad = GLRen.createPaperQuad(selectPaper, -1,-1,1,1, 1)
  
+ class Mode:
+     def __init__(self, **args):
+       self.__dict__ = args
  
  class XuPDFScene_PDFContext:
      def __init__(self):
!       self.modes = [
!               Mode(
!                   mag=(screensize[1]*1.6,screensize[1]/10),
!                   context=1,
!                   movefocus=0,
!                   eye = 0.2,
!               ),
!               Mode(
!                   mag=(screensize[1],screensize[1]), # full-screen
!                   context=0,
!                   movefocus=1,
!                   eye = 0.2,
!               ),
!               Mode(
!                   mag=(screensize[1]*2,screensize[1]/2), # full-screen
!                   context=0,
!                   movefocus=1,
!                   eye = 0.2,
!               ),
!       ]
! 
        self.ctrx = screensize[0]/2
        self.ctry = screensize[1]/2
        self.rad = screensize[1]/2
        self.nadir = NadirAngler(self.ctrx, screensize[1]*2)
        self.clip = 0
        self.selectCS = None
        self.currentvs = None
      def key(self, key):
        global currentScene
        if key == 'm':
!           rotatelist(self.modes)
        if key == 'c':
            self.clip = not self.clip
      def mouse(self, ev):
        global globalx, globaly
        if ev.getID() == ev.MOUSE_CLICKED:
***************
*** 310,316 ****
            else:
                print "Didn't hit anything"
            checkGlobalCoords()
-           self.currentvs = None
            print "Mouse ",globalx, globaly
            AbstractUpdateManager.chg()
        elif ev.getID() == ev.MOUSE_PRESSED:
--- 323,328 ----
***************
*** 339,352 ****
                    ctr[0], ctr[1], s[0], 0, 0, s[1])
            # print "paint: ",ctr, s
            AbstractUpdateManager.chg()
  
  
        else:
            print "Unused mouse: ",ev
      def scene(self, vs):
-       if self.currentvs:
-           AbstractUpdateManager.setNoAnimation()
-           return self.currentvs
        bg(vs)
        bf = effects.NadirCircleFloater_NoAnchor(vs, (self.ctrx, self.ctry), 
self.rad,
                        self.nadir, 1)
--- 351,362 ----
                    ctr[0], ctr[1], s[0], 0, 0, s[1])
            # print "paint: ",ctr, s
            AbstractUpdateManager.chg()
+           replaceNewScene(self.currentvs)
  
  
        else:
            print "Unused mouse: ",ev
      def scene(self, vs):
        bg(vs)
        bf = effects.NadirCircleFloater_NoAnchor(vs, (self.ctrx, self.ctry), 
self.rad,
                        self.nadir, 1)
***************
*** 356,371 ****
  
        cs1 = bf.addCentralBuoy(globalcursor.getId())
  
!       eye = 0.2
!       cs1_zoom= vs.coords.distort(cs1, 0, 0, eye, eye, *(self.mag[0]))
        vs.matcher.add(cs1_zoom, globalcursor.getId()+"__bulg") 
  
!       cs1_trans = vs.coords.translateXY(cs1_zoom, -globalx, -globaly)
        vs.matcher.add(cs1_trans, globalcursor.getId()+"__trans") 
  
        if self.clip:
            clip = (-0.2+globalx, -0.2+globaly, 0.2+globalx, 0.2+globaly)
!           self.cliprect = cliprect
        else:
            w = globalview.papersize[0]
            extrax = 0.1
--- 366,392 ----
  
        cs1 = bf.addCentralBuoy(globalcursor.getId())
  
! 
!       if self.modes[0].movefocus:
!           focusy_at = globaly * screensize[1]
!       else:
!           focusy_at = self.ctry
! 
!       # The buoy cs is centered
!       focusy_at -= self.ctry
! 
!       eye = self.modes[0].eye
!       cs1_zoom= vs.coords.distort(cs1, 0, focusy_at, 
!           eye, eye, *(self.modes[0].mag))
        vs.matcher.add(cs1_zoom, globalcursor.getId()+"__bulg") 
  
!       cs1_trans = vs.coords.translateXY(cs1_zoom, 
!               -globalx, -globaly + focusy_at)
        vs.matcher.add(cs1_trans, globalcursor.getId()+"__trans") 
  
        if self.clip:
            clip = (-0.2+globalx, -0.2+globaly, 0.2+globalx, 0.2+globaly)
!           self.cliprect = clip
        else:
            w = globalview.papersize[0]
            extrax = 0.1
***************
*** 378,384 ****
  
        self.buoys = []
            
!       if self.showcontext:
            for forwlink in globalforw:
                b = XuPDFBuoy(1, (getattr(forwlink, "from"), forwlink.to))
                b.add(vs, 0, 0, 1, bfforw, maincs = cs1_trans)
--- 399,405 ----
  
        self.buoys = []
            
!       if self.modes[0].context:
            for forwlink in globalforw:
                b = XuPDFBuoy(1, (getattr(forwlink, "from"), forwlink.to))
                b.add(vs, 0, 0, 1, bfforw, maincs = cs1_trans)
***************
*** 390,458 ****
        self.currentvs = vs
        self.selectCS = None
        self.papercs = cs1_trans
- 
- class XuPDFScene_PDFZoom:
-     def __init__(self):
-       self.mag = 
[(screensize[1],screensize[1]),(screensize[1]*1.6,screensize[1]/3)]
-       self.clip = 0
-     def key(self, key):
-       print "Key: ",key
-       global currentScene
-       if key == 'z':
-           currentScene = XuPDFScene_PDFContext()
-       if key == 'm':
-           rotatelist(self.mag)
-       if key == 'c':
-           self.clip = not self.clip
-     def mouse(self, ev):
-       global globalx, globaly
-       if ev.getID() == ev.MOUSE_CLICKED:
-           # scale = 1.0 / screensize[1]
-           # globalx += (ev.getX() - screensize[0]/2) * scale
-           # self.y -= ev.getY() - screensize[1]/2
-           # globaly = ev.getY() * scale
- 
-           # Try a real inverse transform
-           point = array([ev.getX(), ev.getY(), 0], 'f')
-           src = zeros(len(point), 'f')
-           self.currentvs.coords.inverseTransformPoints3(
-               self.papercs, point, src)
- 
-           globalx = src[0]
-           globaly = src[1]
-           print "Mouse ret",point, src
-           checkGlobalCoords()
-           print "Mouse ",globalx, globaly
-           AbstractUpdateManager.chg()
-     def scene(self, vs):
-       bg(vs)
-       bf = effects.NadirCircleFloater_NoAnchor(vs, 
-               screenctr,  100, None, 1)
-       cs1 = bf.addCentralBuoy(globalcursor.getId())
-       # cs1_zoom = vs.coords.affineCoordsys(cs1, 0, 0, 0, 
-       #     100, 0, 0, 100)
-       eye = 0.2
-       yat = (globaly-0.5) * screensize[1] 
-       cs1_zoom= vs.coords.distort(cs1, 0, yat, eye, eye, 
-           *(self.mag[0]))
-       vs.matcher.add(cs1_zoom, globalcursor.getId()+"__bulg") 
-       cs1_trans = vs.coords.translateXY(cs1_zoom, -globalx, -globaly + yat)
-       vs.matcher.add(cs1_trans, globalcursor.getId()+"__trans") 
- 
-       if self.clip:
-           clip = (-0.2+globalx, -0.2+globaly, 0.2+globalx, 0.2+globaly)
-       else:
-           w = globalview.papersize[0]
-           extrax = 1
-           extray = 0.3
-           clip = (0-extrax, -extray, w+extrax, 1+extray)
- 
-       globalview.placepapers(vs, cs1_trans, cliprect = clip, 
-           showTessel = globalshowtessel,
-           fancy = globalusefancypaper)
-       self.currentvs = vs
-       self.papercs = cs1_trans
-                   
  
  currentScene = XuPDFScene_PDFContext()
  moveToCell(cells[1])
--- 411,416 ----
Index: gzz/gzz/view/pagespanview.py
diff -c gzz/gzz/view/pagespanview.py:1.8 gzz/gzz/view/pagespanview.py:1.9
*** gzz/gzz/view/pagespanview.py:1.8    Wed Oct  2 08:20:22 2002
--- gzz/gzz/view/pagespanview.py        Wed Oct  2 14:24:35 2002
***************
*** 121,128 ****
        self.cell = cell
        self.content = cell.space.cellTexter.getEnfilade(cell, None)
        self.pap = getPDFPapers(self.content)
!       self.irregu = effects.IrreguFrame(0, 0, self.pap[0][1] / self.pap[0][2] 
* len(self.pap), 1,
!                       0.06, 0.5)
        self.papersize = (self.pap[0][1] * len(self.pap), self.pap[0][2])
  
        h = 1
--- 121,129 ----
        self.cell = cell
        self.content = cell.space.cellTexter.getEnfilade(cell, None)
        self.pap = getPDFPapers(self.content)
!       self.irregu = effects.IrreguFrame(
!          0, 0, self.pap[0][1] / self.pap[0][2] * len(self.pap), 1,
!                       0.06, 0.25)
        self.papersize = (self.pap[0][1] * len(self.pap), self.pap[0][2])
  
        h = 1