[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gfx/demo/xupdf.py gzz/view/xubuoy.py
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz gfx/demo/xupdf.py gzz/view/xubuoy.py |
|
Date: |
Thu, 03 Oct 2002 04:51:47 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/03 04:51:46
Modified files:
gfx/demo : xupdf.py
gzz/view : xubuoy.py
Log message:
Deglobalize
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.42 gzz/gfx/demo/xupdf.py:1.43
*** gzz/gfx/demo/xupdf.py:1.42 Thu Oct 3 03:33:58 2002
--- gzz/gfx/demo/xupdf.py Thu Oct 3 04:51:46 2002
***************
*** 80,84 ****
execfile("gzz/view/xubuoy.py")
currentScene = XuPDFScene_PDFContext()
! moveToCell(cells[1])
--- 80,84 ----
execfile("gzz/view/xubuoy.py")
currentScene = XuPDFScene_PDFContext()
! currentScene.moveToCell(cells[1])
Index: gzz/gzz/view/xubuoy.py
diff -c gzz/gzz/view/xubuoy.py:1.3 gzz/gzz/view/xubuoy.py:1.4
*** gzz/gzz/view/xubuoy.py:1.3 Thu Oct 3 04:43:36 2002
--- gzz/gzz/view/xubuoy.py Thu Oct 3 04:51:46 2002
***************
*** 30,98 ****
font = GL.createFont("gfx/fonts/a010013l.pfb", 32);
return font
- globalcursor = None
globalspan = None
# Paper coordinates of current focus
globalx = 0
globaly = 0
- globalusefancypaper = 1
-
- globalshowtessel = 0
-
- def moveToCell(cell, nx=1, ny=1):
- global globalcursor, globalx, globaly, globalview
- global globalforw, globalback, globalspan
-
- # Check type
- if 1: # PDF
- globalview = getCellPDFView(cell)
-
- globalcursor = cell
- globalx, globaly = nx, ny
-
- content = space.cellTexter.getEnfilade(cell, None)
- globalspan = enf2span(content)
- globalforw = xuindexer.getForwardIndex().getMatches(content)
- globalback = xuindexer.getBackwardIndex().getMatches(content)
-
- print "Xu: ",globalforw,globalback
-
- java.lang.System.gc()
- AbstractUpdateManager.chg()
-
def getCellPDFView(cell):
return pagespanview.CellPDFView(cell)
-
- def globalkey(key):
- global globalusefancypaper, globalshowtessel
- if '1' <= key <= '9':
- moveToCell(cells[int(key)-1])
- elif key == 'l':
- pagespanview.globalLOD = 1 - pagespanview.globalLOD
- print "Lod: ",pagespanview.globalLOD
- AbstractUpdateManager.chg()
- elif key == 'p':
- globalusefancypaper = not globalusefancypaper
- elif key == ',':
- pagespanview.globalseedoffs -= 1
- moveToCell(globalcursor)
- elif key == '.':
- pagespanview.globalseedoffs += 1
- moveToCell(globalcursor)
- elif key == 't':
- globalshowtessel = not globalshowtessel
-
- def checkGlobalCoords():
- global globalx, globaly
- if globalx < 0: globalx = 0
- if globaly < 0: globaly = 0
- if globalx > globalview.scaledsize[0]: globalx = globalview.scaledsize[0]
- if globaly > globalview.scaledsize[1]: globaly = globalview.scaledsize[1]
-
fps_text = GLRen.createHorizText2(getFont(), "FOO", 1, 1, 1, 1)
GL.setDebugVar("JNI.fps", 1)
# Show the intended screen size
--- 30,45 ----
***************
*** 119,124 ****
--- 66,72 ----
class XuPDFBuoy:
def __init__(self, linkindex, link):
+ self.cursor = None
self.link = link
self.linkindex = linkindex
self.linkspan = link[linkindex].getList()[0]
***************
*** 146,152 ****
self.buoyscale = 400
def add(self, vs, anchorX, anchorY, importance, floater,
! maincs = None):
if not self.cell:
return
cell = self.cell
--- 94,100 ----
self.buoyscale = 400
def add(self, vs, anchorX, anchorY, importance, floater,
! maincs = None, globalview = None):
if not self.cell:
return
cell = self.cell
***************
*** 222,227 ****
--- 170,177 ----
class XuPDFScene_PDFContext:
def __init__(self, win=None):
+ self.usefancypaper = 1
+ self.showtessel = 0
self.win = win
self.modes = [
Mode(
***************
*** 255,262 ****
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:
--- 205,234 ----
global currentScene
if key == 'm':
rotatelist(self.modes)
! elif key == 'c':
self.clip = not self.clip
+ elif key == 'l':
+ pagespanview.globalLOD = 1 - pagespanview.globalLOD
+ print "Lod: ",pagespanview.globalLOD
+ AbstractUpdateManager.chg()
+ elif key == 'p':
+ self.usefancypaper = not self.usefancypaper
+ elif key == ',':
+ pagespanview.globalseedoffs -= 1
+ self.moveToCell(self.cursor)
+ elif key == '.':
+ pagespanview.globalseedoffs += 1
+ self.moveToCell(self.cursor)
+ elif key == 't':
+ self.showtessel = not self.showtessel
+
+ def checkGlobalCoords(self):
+ global globalx, globaly
+ if globalx < 0: globalx = 0
+ if globaly < 0: globaly = 0
+ if globalx > self.view.scaledsize[0]: globalx = self.view.scaledsize[0]
+ if globaly > self.view.scaledsize[1]: globaly = self.view.scaledsize[1]
+
def mouse(self, ev):
global globalx, globaly
if ev.getID() == ev.MOUSE_CLICKED:
***************
*** 265,279 ****
h = b.hit(self.currentvs.coords, point)
if h:
print "BUOY HIT!\n"
! moveToCell(b.cell, *h)
AbstractUpdateManager.chg()
return
! h = globalview.hitClip(self.currentvs.coords, point, None)
if h:
globalx,globaly = h
else:
print "Didn't hit anything"
! checkGlobalCoords()
print "Mouse ",globalx, globaly
AbstractUpdateManager.chg()
elif ev.getID() == ev.MOUSE_PRESSED:
--- 237,251 ----
h = b.hit(self.currentvs.coords, point)
if h:
print "BUOY HIT!\n"
! self.moveToCell(b.cell, *h)
AbstractUpdateManager.chg()
return
! h = self.view.hitClip(self.currentvs.coords, point, None)
if h:
globalx,globaly = h
else:
print "Didn't hit anything"
! self.checkGlobalCoords()
print "Mouse ",globalx, globaly
AbstractUpdateManager.chg()
elif ev.getID() == ev.MOUSE_PRESSED:
***************
*** 311,316 ****
--- 283,310 ----
else:
print "Unused mouse: ",ev
+
+ def moveToCell(self, cell, nx=1, ny=1):
+ global globalx, globaly
+ global globalforw, globalback, globalspan
+
+ # Check type
+ if 1: # PDF
+ self.view = getCellPDFView(cell)
+
+ self.cursor = cell
+ globalx, globaly = nx, ny
+
+ content = space.cellTexter.getEnfilade(cell, None)
+ globalspan = enf2span(content)
+ globalforw = xuindexer.getForwardIndex().getMatches(content)
+ globalback = xuindexer.getBackwardIndex().getMatches(content)
+
+ print "Xu: ",globalforw,globalback
+
+ java.lang.System.gc()
+ AbstractUpdateManager.chg()
+
def scene(self, vs):
bg(vs)
bf = effects.NadirCircleFloater_NoAnchor(vs, (self.ctrx, self.ctry),
self.rad,
***************
*** 319,325 ****
self.nadir, -1)
print "Context"
! cs1 = bf.addCentralBuoy(globalcursor.getId())
if self.modes[0].movefocus:
--- 313,319 ----
self.nadir, -1)
print "Context"
! cs1 = bf.addCentralBuoy(self.cursor.getId())
if self.modes[0].movefocus:
***************
*** 333,367 ****
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
extray = 0.1
clip = (0-extrax, -extray, w+extrax, 1+extray)
self.cliprect = None
! globalview.placepapers(vs, cs1_trans, cliprect = clip,
! fancy = globalusefancypaper, showTessel = globalshowtessel)
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)
self.buoys.append(b)
for backlink in globalback:
b = XuPDFBuoy(0,(getattr(backlink,"from"), backlink.to))
! b.add(vs, 0, 0, 1, bf, maincs = cs1_trans)
self.buoys.append(b)
self.currentvs = vs
self.selectCS = None
--- 327,363 ----
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, self.cursor.getId()+"__bulg")
cs1_trans = vs.coords.translateXY(cs1_zoom,
-globalx, -globaly + focusy_at)
! vs.matcher.add(cs1_trans, self.cursor.getId()+"__trans")
if self.clip:
clip = (-0.2+globalx, -0.2+globaly, 0.2+globalx, 0.2+globaly)
self.cliprect = clip
else:
! w = self.view.papersize[0]
extrax = 0.1
extray = 0.1
clip = (0-extrax, -extray, w+extrax, 1+extray)
self.cliprect = None
! self.view.placepapers(vs, cs1_trans, cliprect = clip,
! fancy = self.usefancypaper, showTessel = self.showtessel)
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,
! globalview = self.view)
self.buoys.append(b)
for backlink in globalback:
b = XuPDFBuoy(0,(getattr(backlink,"from"), backlink.to))
! b.add(vs, 0, 0, 1, bf, maincs = cs1_trans,
! globalview = self.view)
self.buoys.append(b)
self.currentvs = vs
self.selectCS = None