[Gzz-commits] gzz/gzz/view pagespanview.py xubuoy.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/12 13:41:49

Modified files:
        gzz/view       : pagespanview.py xubuoy.py 

Log message:
        More debugging for xupdf

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: gzz/gzz/view/pagespanview.py
diff -u gzz/gzz/view/pagespanview.py:1.22 gzz/gzz/view/pagespanview.py:1.23
--- gzz/gzz/view/pagespanview.py:1.22   Mon Dec  9 09:16:28 2002
+++ gzz/gzz/view/pagespanview.py        Thu Dec 12 13:41:48 2002
@@ -207,6 +207,7 @@
 
 class CellPDFView:
     dicefactor = 2
+    # dicefactor = .5
     """A view of a PDF file in a cell, spread out in space.
     """
     def __init__(self, cell):
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.38 gzz/gzz/view/xubuoy.py:1.39
--- gzz/gzz/view/xubuoy.py:1.38 Wed Dec 11 17:25:40 2002
+++ gzz/gzz/view/xubuoy.py      Thu Dec 12 13:41:48 2002
@@ -58,6 +58,11 @@
     TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 10
 """,
 """
+    TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_LINEAR
+    TexParameter TEXTURE_2D TEXTURE_MAG_FILTER NEAREST
+    TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 1
+""",
+"""
     TexParameter TEXTURE_2D TEXTURE_MIN_FILTER LINEAR_MIPMAP_NEAREST
     TexParameter TEXTURE_2D TEXTURE_MAG_FILTER NEAREST
     TexParameter TEXTURE_2D TEXTURE_MAX_ANISOTROPY_EXT 1
@@ -74,10 +79,13 @@
 def background(rgb):
     return gzz.vob.vobs.SolidBgVob(java.awt.Color(float(rgb[0]), 
float(rgb[1]), float(rgb[2])))
 
+showFPS = 0
+
 fps_text = GLRen.createHorizText2(getFont(), "FOO", 1, 1, 1, 1)
 GL.setDebugVar("JNI.fps", 1)
 # Show the intended screen size
-def bg(vs):
+def bg(vs, color):
+    vs.map.put(background(color))
     if 0:
        vs.map.put(GLCache.getCallList("""
            Disable TEXTURE_2D
@@ -91,9 +99,10 @@
            End
            Enable TEXTURE_2D
        """ % { "w": screensize[0], "h": screensize[1] } ) )
-       #fps = vs.coords.ortho(0, 10, 10, 20, 30.5, 30.5)
-       #vs.matcher.add(fps, "FPS")
-       #vs.map.put(fps_text, fps, 0)
+    if showFPS:
+       fps = vs.coords.ortho(0, 10, 10, 20, 30.5, 30.5)
+       vs.matcher.add(fps, "FPS")
+       vs.map.put(fps_text, fps, 0)
     
 style = gzz.client.GraphicsAPI.getInstance().getTextStyle("SansSerif", 
java.awt.Font.PLAIN, 10)
 contview = gzz.view.LinebrokenCellContentView(style)
@@ -201,7 +210,7 @@
 
        if nadircs != None:
            cs1_nad = vs.coords.nadirOrigin(cs1, nadircs)
-           vs.matcher.addSub(cs1, cs1_nad, "N")
+           vs.matcher.add(cs1, cs1_nad, "N")
            cs1 = cs1_nad
 
         if hasattr(self, 'pctr'):
@@ -442,6 +451,10 @@
            self.showtessel = not self.showtessel
            AbstractUpdateManager.setNoAnimation()
            AbstractUpdateManager.chg()
+       elif key == 'T':
+           global showFPS
+           showFPS = 1 - showFPS
+           AbstractUpdateManager.chg()
         elif key == 's':
             # select some rect at random
             # for testing w/o mouse :-)
@@ -593,7 +606,7 @@
            AbstractUpdateManager.chg()
 
     def scene(self, vs):
-       vs.map.put(background(self.bgcolor))
+       bg(vs,self.bgcolor)
 
        swidth = vs.size.width
        sheight = vs.size.height
@@ -626,7 +639,7 @@
        vs.matcher.add(cs1, self.cursor.getId()) 
 
        cs1_nad = vs.coords.nadirOrigin(cs1, nadircs)
-       vs.matcher.addSub(cs1, cs1_nad, "N")
+       vs.matcher.add(cs1, cs1_nad, "N")
        cs1 = cs1_nad
 
        mf = self.modes[0].movefocus