[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx demo/xupdf.py librenderables/renderable...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gfx demo/xupdf.py librenderables/renderable... |
Date: |
Wed, 18 Sep 2002 21:51:35 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/18 21:51:34
Modified files:
gfx/demo : xupdf.py
gfx/librenderables: renderables.py
Log message:
Zooming and scaling parameter fiddling
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/xupdf.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/renderables.py.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
Patches:
Index: gzz/gfx/demo/xupdf.py
diff -c gzz/gfx/demo/xupdf.py:1.13 gzz/gfx/demo/xupdf.py:1.14
*** gzz/gfx/demo/xupdf.py:1.13 Wed Sep 18 21:20:04 2002
--- gzz/gfx/demo/xupdf.py Wed Sep 18 21:51:34 2002
***************
*** 145,164 ****
def placepapers(vs, cs2, papers, key, x, y, paperx, papery, h,
onlypages=None):
# The height in coords
ph = papers[0][2]
! expscale(vs, key+"__pscale_", h/ph)
! curx = x - paperx
! ycoord = y - papery
print "x,y for place: ",curx, ycoord
for i in range(0, len(papers)):
# create always all cs, gets interpolation better
cs1 = vs.coords.affineCoordsys(0, key+"_p_"+str(i), 10,
! curx, ycoord, 1, 0, 0, 1)
if onlypages == None or i in onlypages:
pq = GZZGL.createFisheyePaperQuad(
papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21, 3)
vs.map.put(pq, cs1, cs2)
! curx += 1.02 * papers[i][1]
! poptrans(vs, key+"__pscale_")
def bg(vs):
putnoc(vs, background((0.3,0.5,0.4)))
--- 145,163 ----
def placepapers(vs, cs2, papers, key, x, y, paperx, papery, h,
onlypages=None):
# The height in coords
ph = papers[0][2]
! scale = h/ph
! curx = x - paperx * scale
! ycoord = y - papery * scale
print "x,y for place: ",curx, ycoord
for i in range(0, len(papers)):
# create always all cs, gets interpolation better
cs1 = vs.coords.affineCoordsys(0, key+"_p_"+str(i), 10,
! curx, ycoord, scale, 0, 0, scale)
if onlypages == None or i in onlypages:
pq = GZZGL.createFisheyePaperQuad(
papers[i][0], 0, 0, papers[i][1], papers[i][2], 21, 21, 3)
vs.map.put(pq, cs1, cs2)
! curx += 1.02 * papers[i][1] * scale
def bg(vs):
putnoc(vs, background((0.3,0.5,0.4)))
***************
*** 232,240 ****
print "Context"
# The non-moving bulge coordinate
cs2 = vs.coords.affineCoordsys(0, globalcursor.getId()+"__bulg",
! 4,
0, 0,
! 15, 0,0,30)
class CentralB(Runnable):
def run(rself):
--- 231,239 ----
print "Context"
# The non-moving bulge coordinate
cs2 = vs.coords.affineCoordsys(0, globalcursor.getId()+"__bulg",
! 0.03,
0, 0,
! 5, 0,0, 9)
class CentralB(Runnable):
def run(rself):
***************
*** 251,262 ****
addbuoy(vs, 0, 0, 1, bf, getattr(backlink,"from"))
class XuPDFScene_PDFZoom:
def key(self, key):
print "Key: ",key
global currentScene
if key == 'z':
currentScene = XuPDFScene_PDFContext()
! pass
def mouse(self, ev):
global globalx, globaly
if ev.getID() == ev.MOUSE_CLICKED:
--- 250,264 ----
addbuoy(vs, 0, 0, 1, bf, getattr(backlink,"from"))
class XuPDFScene_PDFZoom:
+ def __init__(self):
+ self.mag = [0.7, 10]
def key(self, key):
print "Key: ",key
global currentScene
if key == 'z':
currentScene = XuPDFScene_PDFContext()
! if key == 'm':
! rotatelist(self.mag)
def mouse(self, ev):
global globalx, globaly
if ev.getID() == ev.MOUSE_CLICKED:
***************
*** 268,285 ****
AbstractUpdateManager.chg()
def scene(self, vs):
bg(vs)
! cs2 = vs.coords.affineCoordsys(0, globalcursor.getId()+"__bulg", 0.5,
0, globaly / globalpap[0][2] * screensize[1] - screensize[1]/2,
! 20, 0,0, 40)
bf = NadirCircleFloater_NoAnchor(vs,
screenctr, 100, None, 1)
class CentralB(Runnable):
! def run(self):
placepapers(vs, cs2, globalpap, globalcursor.getId(), 0,
globaly / globalpap[0][2] * screensize[1] -
screenctr[1],
globalx, globaly,
! screensize[1] * 0.7)
bf.addCentralBuoy(globalcursor.getId(), CentralB())
currentScene = XuPDFScene_PDFZoom()
--- 270,287 ----
AbstractUpdateManager.chg()
def scene(self, vs):
bg(vs)
! cs2 = vs.coords.affineCoordsys(0, globalcursor.getId()+"__bulg",
self.mag[0],
0, globaly / globalpap[0][2] * screensize[1] - screensize[1]/2,
! 80 * self.mag[0], 0,0, 80 * self.mag[0])
bf = NadirCircleFloater_NoAnchor(vs,
screenctr, 100, None, 1)
class CentralB(Runnable):
! def run(rself):
placepapers(vs, cs2, globalpap, globalcursor.getId(), 0,
globaly / globalpap[0][2] * screensize[1] -
screenctr[1],
globalx, globaly,
! screensize[1] * (self.mag[0]/(0.5+self.mag[0])))
bf.addCentralBuoy(globalcursor.getId(), CentralB())
currentScene = XuPDFScene_PDFZoom()
Index: gzz/gfx/librenderables/renderables.py
diff -c gzz/gfx/librenderables/renderables.py:1.51
gzz/gfx/librenderables/renderables.py:1.52
*** gzz/gfx/librenderables/renderables.py:1.51 Wed Sep 18 21:20:04 2002
--- gzz/gfx/librenderables/renderables.py Wed Sep 18 21:51:34 2002
***************
*** 556,562 ****
ZPt pos = coords1.transform(Pt(x,y));
ZPt v = cs2inv.transform(pos);
! v.z = exp(coords2.z);
coords2.vertex(bulge(v));
}
}
--- 556,562 ----
ZPt pos = coords1.transform(Pt(x,y));
ZPt v = cs2inv.transform(pos);
! v.z = 1/(coords2.z);
coords2.vertex(bulge(v));
}
}