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

[Tuomas J. Lukka]

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

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

Log message:
        Fix xupdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.232&tr2=1.233&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -c gzz/TODO:1.232 gzz/TODO:1.233
*** gzz/TODO:1.232      Thu Oct  3 13:19:19 2002
--- gzz/TODO    Thu Oct  3 14:16:41 2002
***************
*** 29,34 ****
--- 29,36 ----
        - xupdf:
            - combine client and xubuoy
            - text
+           - edit bindings for xupdf demo 
+               - marking page spans (after painted with mouse) 
            - reload button  (key to reload jython code!)
            - multiple instances of same cell visible as a buoy --> keys?
                - special matcher? or pp/VobKeyer?
***************
*** 56,65 ****
          caching problems.
      tjl:
        - xupdf: distorted multi-page PDF view with xu links
-           - proper buoy placement
            - adjustable zoom / distortion area by mouse
!           - edit bindings for xupdf demo 
!               - marking page spans (after painted with mouse) 
            - larger structure 
                - faster loading of pagespan images
                    - use lower resolution first, lazily load better
--- 58,66 ----
          caching problems.
      tjl:
        - xupdf: distorted multi-page PDF view with xu links
            - adjustable zoom / distortion area by mouse
!           - better graphics for xu links
!           - proper buoy placement
            - larger structure 
                - faster loading of pagespan images
                    - use lower resolution first, lazily load better
***************
*** 71,77 ****
                - paperquad texture binding LOD?
                    - only when certain that texture memory
                      bandwidth is the problem.
-           - better graphics for xu links
              + use translucent instead of XORing rectangle for
                showing selection [ should be easy ]
            + clean up the xupdf.py file
--- 72,77 ----
***************
*** 132,137 ****
--- 132,138 ----
        - clean, rename and document Makefile targets (coordinate with mudyc:
          do we want to use something else instead of make?)
      tjl:
+       - IndexManager xuindexer semantics fix
        - buoy and nadir fixing
            - implement as a new coordinate system type!
                - need same for nadir, then
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.50 gzz/gfx/demo/xupdf.py:1.51
*** gzz/gfx/demo/xupdf.py:1.50  Thu Oct  3 13:19:19 2002
--- gzz/gfx/demo/xupdf.py       Thu Oct  3 14:16:42 2002
***************
*** 21,28 ****
  from test.tools import tools
  
  space = gzz.impl.ModularSpace(*tools.spaceArgList())
  # xuindexer = gzz.index.impl.TransientXuIndexer()
! xuindexer = gzz.index.IndexManager.getXuIndexer(space)
  enfoverlap = gzz.index.IndexManager.getEnfiladeOverlap(space)
  
  enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
--- 21,29 ----
  from test.tools import tools
  
  space = gzz.impl.ModularSpace(*tools.spaceArgList())
+ xuspace = gzz.impl.ModularSpace(*tools.spaceArgList())
  # xuindexer = gzz.index.impl.TransientXuIndexer()
! xuindexer = gzz.index.IndexManager.getXuIndexer(xuspace)
  enfoverlap = gzz.index.IndexManager.getEnfiladeOverlap(space)
  
  enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
***************
*** 71,77 ****
  
  import gzz.view.xubuoy
  reload(gzz.view.xubuoy)
- from gzz.view.xubuoy import *
  
  #execfile("gzz/view/xubuoy.py")
  
--- 72,77 ----
***************
*** 79,84 ****
      if '1' <= key <= '9':
          currentScene.moveToCell(cells[ord(key) - ord('1')])
  
! currentScene = XuPDFScene_PDFContext(space)
! currentScene.moveToCell(cells[1])
  
--- 79,84 ----
      if '1' <= key <= '9':
          currentScene.moveToCell(cells[ord(key) - ord('1')])
  
! currentScene = gzz.view.xubuoy.XuPDFScene_PDFContext(xuspace)
! currentScene.moveToCell(cells[1], 0, 0, redraw=1)
  
Index: gzz/gzz/view/pagespanview.py
diff -c gzz/gzz/view/pagespanview.py:1.11 gzz/gzz/view/pagespanview.py:1.12
*** gzz/gzz/view/pagespanview.py:1.11   Thu Oct  3 14:13:32 2002
--- gzz/gzz/view/pagespanview.py        Thu Oct  3 14:16:42 2002
***************
*** 120,125 ****
--- 120,126 ----
          self.black = GLCache.getCallList("Color 0 0 0")
        self.cell = cell
        self.content = cell.space.cellTexter.getEnfilade(cell, None)
+       print "Cell content: ",self.content.toString()
        self.pap = getPDFPapers(self.content)
        self.irregu = effects.IrreguFrame(
           0, 0, self.pap[0][1] / self.pap[0][2] * len(self.pap), 1,
***************
*** 140,145 ****
--- 141,147 ----
                    cliprect = None,
                    fancy = 1,
                    showTessel = 0):
+       print "Placepapers: ", self.papersize, self.scaledsheetsize, 
self.scaledsize, "pages: ",len(self.pap)
        self.papercoordsys = cs1into
        self.cliprect = cliprect
        key = self.cell.getId()
Index: gzz/gzz/view/xubuoy.py
diff -c gzz/gzz/view/xubuoy.py:1.17 gzz/gzz/view/xubuoy.py:1.18
*** gzz/gzz/view/xubuoy.py:1.17 Thu Oct  3 14:13:19 2002
--- gzz/gzz/view/xubuoy.py      Thu Oct  3 14:16:42 2002
***************
*** 168,174 ****
  
        print "lineconn!"
        vs.map.put(GLCache.getCallList("""
!           PushAttrib ENABLE_BIT
            Disable TEXTURE_2D
            LineWidth 5
            Enable BLEND
--- 168,174 ----
  
        print "lineconn!"
        vs.map.put(GLCache.getCallList("""
!           PushAttrib ENABLE_BIT LINE_BIT
            Disable TEXTURE_2D
            LineWidth 5
            Enable BLEND