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

[Tuomas J. Lukka]

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

Modified files:
        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/gfx/demo/xupdf.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/xupdf.py
diff -u gzz/gfx/demo/xupdf.py:1.59 gzz/gfx/demo/xupdf.py:1.60
--- gzz/gfx/demo/xupdf.py:1.59  Fri Jan 24 04:09:30 2003
+++ gzz/gfx/demo/xupdf.py       Mon Feb 10 15:14:55 2003
@@ -14,6 +14,9 @@
 
 from gfx.libutil import saveanim
 
+gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
+gzz.gfx.gl.PageSpanPaper.paperMillWindow = w
+
 # Now, this is the start of the REAL demo, the one
 # with Xanadu links between PDF and text.
 
Index: gzz/gzz/view/pagespanview.py
diff -u gzz/gzz/view/pagespanview.py:1.30 gzz/gzz/view/pagespanview.py:1.31
--- gzz/gzz/view/pagespanview.py:1.30   Tue Jan 28 06:31:28 2003
+++ gzz/gzz/view/pagespanview.py        Mon Feb 10 15:14:56 2003
@@ -27,31 +27,15 @@
 else:
     optimizedPaper = 1
 
-globalscrollblockPapers = {}
-
 window = None
 
-def getScrollblockPaper(sb):
-    """Get the paper object for a given scrollblock.
-    """
-    hashkey = sb.hashCode() + globalseedoffs
-    ret = globalscrollblockPapers.get(hashkey, None)
-    if ret == None:
-       if optimizedPaper:
-           ret = papermill.getOptimizedPaper(hashkey, window)
-       else:
-           ret = papermill.getPaper(hashkey)
-       globalscrollblockPapers[hashkey] = ret
-    return ret
-
 def getPDFPapers(content):
     contentspan = enf2span(content)
-    scrollblockPaper = getScrollblockPaper(contentspan.getScrollBlock())
     ret = []
     for i in range(0, content.length()):
-       rect = PageSpanPaper(scrollblockPaper,
-                           GLSpanner.getSpanRect(
-                               contentspan.subSpan(i, i+1)).page)
+       span = contentspan.subSpan(i, i+1)
+       rect = PageSpanPaper(GLSpanner.getSpanRect(span).page,
+                   span.getScrollBlock().hashCode())
        ret.append( rect )
     return ret
 
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.46 gzz/gzz/view/xubuoy.py:1.47
--- gzz/gzz/view/xubuoy.py:1.46 Tue Jan 28 06:31:28 2003
+++ gzz/gzz/view/xubuoy.py      Mon Feb 10 15:14:56 2003
@@ -1,6 +1,8 @@
 from __future__ import nested_scopes
 
 import gzz
+
+
 import gzz.client
 
 from gzz.index import XuLink