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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/18 07:23:26

Modified files:
        gfx/demo       : xupdf.py 

Log message:
        Use real cells and space, be able to swap between two documents

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

Patches:
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.6 gzz/gfx/demo/xupdf.py:1.7
*** gzz/gfx/demo/xupdf.py:1.6   Wed Sep 18 06:01:26 2002
--- gzz/gfx/demo/xupdf.py       Wed Sep 18 07:23:26 2002
***************
*** 1,18 ****
  from __future__ import nested_scopes
- from gzz.gfx.gl import GZZGL,GLSpans,Paper
- import gzz
- 
  # Now, this is the start of the REAL demo, the one
  # with Xanadu links between PDF and text.
  
  screensize = (1024, 768) # assuming XGA projector.
  
! pages = gzz.media.impl.PageImageScroll(None, gzz.mediaserver.Mediaserver.Id(
!     
"0000000008000000E9573F43E00004CB42D4BEFEBAA27C20403F7D57693141B9E4D9A46329AC9C"))
  
! prect = [
!     GLSpans.getRect(pages.getCurrent().subSpan(i,i+1))
!       for i in range(0,pages.getCurrent().length())]
  
  def pdfpaper(pdfrect): 
      # Papercoords: (0,0) .. (w,h) where
--- 1,70 ----
  from __future__ import nested_scopes
  # Now, this is the start of the REAL demo, the one
  # with Xanadu links between PDF and text.
  
  screensize = (1024, 768) # assuming XGA projector.
  
! from gzz.gfx.gl import GZZGL,GLSpans,Paper
! import gzz
! from test.tools import tools
! execfile("gfx/libutil/effects.py")
! 
! space = gzz.impl.ModularSpace(*tools.spaceArgList())
! xuindexer = gzz.index.impl.TransientXuIndexer()
! enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
! 
! # A PDF file
! pagescroll1 = gzz.media.impl.PageImageScroll(None, 
!       gzz.mediaserver.Mediaserver.Id(
! 
"0000000008000000E9573F43E00004CB42D4BEFEBAA27C20403F7D57693141B9E4D9A46329AC9C"))
! 
! # A second one
! pagescroll2 = gzz.media.impl.PageImageScroll(None, 
!       gzz.mediaserver.Mediaserver.Id(
! 
"0000000008000000E9573F40460004592C0AC2038D1250E0ED08F865D8C9148654B87A7AA82CC6"))
! 
! d1cell = space.N()
! d1 = space.getDim(d1cell)
! 
! # Two cells, with one PDF span in each
! home = space.getHomeCell()
! c1 = home.N(d1)
! c2 = c1.N(d1)
! 
! space.cellTexter.setEnfilade(c1, 
enfMaker.makeEnfilade(pagescroll1.getCurrent()))
! space.cellTexter.setEnfilade(c2, 
enfMaker.makeEnfilade(pagescroll2.getCurrent()))
! 
! globalcursor = None
! 
! # Paper coordinates of current focus
! globalx = 0
! globaly = 0
! 
! def moveToCell(cell):
!     global globalcursor, globalx, globaly, globalpap
! 
!     content = space.cellTexter.getEnfilade(cell, None)
  
!     # Check type
!     if 1: # PDF
!       list = content.getList()
!       print list
!       content = list[0]
!       prect = [
!           GLSpans.getRect(content.subSpan(i,i+1))
!               for i in range(0,content.length())]
!       globalpap = [
!           pdfpaper(p) for p in prect
!       ]
! 
!     AbstractUpdateManager.chg()
! 
! 
! def globalkey(key):
!     if key == '1':
!       moveToCell(c1)
!     if key == '2':
!       moveToCell(c2)
  
  def pdfpaper(pdfrect): 
      # Papercoords: (0,0) .. (w,h) where
***************
*** 57,66 ****
                              0, 0,  0, 1])
      return (pap, pw, ph)
  
- globalpap = [
-     pdfpaper(p) for p in prect
- ]
- 
  def placepapers(vs, cs2, papers, key, x, y, paperx, papery, h, 
onlypages=None):
      # The height in coords
      ph = papers[0][2]
--- 109,114 ----
***************
*** 75,84 ****
                papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21)
            vs.map.put(pq, cs1, cs2)
        curx += 1.02 * h/ph * papers[i][1]
-       
- # Paper coordinates of current focus
- globalx = 0
- globaly = 0
  
  def bg(vs):
      putnoc(vs, background((0.3,0.5,0.4)))
--- 123,128 ----
***************
*** 98,103 ****
--- 142,151 ----
  class XuPDFScene_PDFContext:
      def __init__(self):
        self.yheight = 50
+       self.ctrx = screensize[0]/2
+       self.ctry = screensize[1]/2
+       self.rad = screensize[1]/2
+       self.nadir = NadirAngler(self.ctrx, screensize[1]*2)
      def key(self, key):
        global currentScene
        if key == 'z':
***************
*** 112,117 ****
--- 160,167 ----
            AbstractUpdateManager.chg()
      def scene(self, vs):
        bg(vs)
+       self.bf = NadirCircleFloater(vs, (self.ctrx, self.ctry), self.rad,
+                       (self.ctrx+1.5*self.rad, self.ctry), self.nadir)
        print "Context"
        cs2 = vs.coords.affineCoordsys(0, "2", -3, 
                screensize[0]/2, 0.9 * screensize[1]/2, 50, 0,0,50)
***************
*** 149,152 ****
--- 199,203 ----
                    768)
  
  currentScene = XuPDFScene_PDFZoom()
+ moveToCell(c1)