[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf... |
Date: |
Tue, 12 Aug 2003 04:54:25 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Matti Katila <address@hidden> 03/08/12 04:54:25
Modified files:
org/fenfire/bin: fenpdf10.py
org/fenfire/demo: fenpdfcontext.py
Log message:
fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.22
fenfire/org/fenfire/bin/fenpdf10.py:1.23
--- fenfire/org/fenfire/bin/fenpdf10.py:1.22 Tue Aug 12 04:36:08 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Tue Aug 12 04:54:24 2003
@@ -359,7 +359,7 @@
self.context.states.lastEvent = ev
return 0
- def contextMouse(self, ev):
+ def contextMouse(self, ev, oldvs):
# ...then see context
if ev.getType() != ev.MOUSE_CLICKED:
return 0
@@ -452,12 +452,13 @@
self.context.setMngr(self.buoyManager)
def scene(self, vs):
+ self.vs = vs
self.buoyManager.scene(vs)
self.context.renderContext(vs, 0)
def mouse(self, ev):
if not self.buoyManager.mouse(ev):
- self.eventHandler.contextMouse(ev)
+ self.eventHandler.contextMouse(ev, self.vs)
def key(self, key):
self.eventHandler.key(key)
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.25
fenfire/org/fenfire/demo/fenpdfcontext.py:1.26
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.25 Tue Aug 12 04:12:06 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py Tue Aug 12 04:54:24 2003
@@ -120,8 +120,8 @@
self.pageview = None
self.alph = None
- # buoymanager, set with setMgr()
- self.mgr = None
+ # buoymanager, set with setBuoymanager()
+ self.buoymanager = None
# main view mouse multiplexer
self.mainMouse = None
@@ -168,42 +168,42 @@
class MouseMenu:
class Action:
def __init__(self, states):
- self.s = states
+ self.states = states
def run(self):
pass
class LinkL(Action):
def run(self):
- obj = self.s.objectOnPlane
- pp = self.s.pp
- pp.assocNotes(obj, -1, self.s.cursor.getAccursed())
+ obj = self.states.objectOnPlane
+ pp = self.states.pp
+ pp.assocNotes(obj, -1, self.states.cursor.getAccursed())
class LinkR(Action):
def run(self):
- obj = self.s.objectOnPlane
- pp = self.s.pp
- pp.assocNotes(obj, 1, self.s.cursor.getAccursed())
+ obj = self.states.objectOnPlane
+ pp = self.states.pp
+ pp.assocNotes(obj, 1, self.states.cursor.getAccursed())
class UnlinkBuoy(Action):
def run(self):
- link = self.s.mgr.buoyHit.link
+ link = self.states.buoymanager.buoyHit.link
#(otherNode, linkId, otherAnchor, into)
if dbg:
p('linkid',link[1],'otheranchor',link[2],'othernode',link[0])
- pp = self.s.pp
+ pp = self.states.pp
a,b = link[1].first, link[1].second
pp.detachNotes(a, 1, b)
pp.detachNotes(a, -1, b)
class KillPlane(Action):
def run(self):
- main = self.s.mgr.getLastMain()
+ main = self.states.buoymanager.getLastMain()
if isinstance(main, ff.view.buoy.MainNode2D):
- self.s.pp.deletePaper(main.getPlane())
+ self.states.pp.deletePaper(main.getPlane())
elif isinstance(main, ff.view.buoy.FisheyeMainNode2D):
p('foo fish eye')
class GoHome(Action):
def run(self):
pass
- #self.s.mgr.singles[1].mainNode =
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
+ #self.s.buoymanager.singles[1].mainNode =
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
def __init__(self, states):
@@ -277,11 +277,11 @@
self.mousemenu = MouseMenu(self.states)
- def setMngr(self, mngr):
- self.states.mgr = mngr
+ def setBuoyManager(self, manager):
+ self.states.buoymanager = manager
def key(self, key):
- self.keys.key(key, self.states.mgr.getLastMain())
+ self.keys.key(key, self.states.buoymanager.getLastMain())
# call back from AbstractMainNode2D
def changeFastAfterMouseEvent(self):
@@ -300,7 +300,7 @@
#self.super.mainNodeToBeRender(vs, into, main)
# draw cursor
- if not self.states.cursor.hasAccursed() and main ==
self.states.mgr.getLastMain():
+ if not self.states.cursor.hasAccursed() and main ==
self.states.buoymanager.getLastMain():
tmp = jarray.zeros(2, 'f')
vs.coords.getSqSize(into, tmp)
cursorCS = vs.orthoBoxCS(into, "CURSOR", 0,
@@ -310,7 +310,7 @@
def chgFast(self, oldVS):
- s = self.states.mgr.getSingles()
+ s = self.states.buoymanager.getSingles()
for i in s:
i.getMainNode().chgFast(oldVS)
@@ -349,7 +349,7 @@
key = oldVS.getKeyAt(self.mousebuttons, ev.getX(), ev.getY(), None)
if key == None: return 0
- mgr = self.states.mgr
+ buoymanager = self.states.buoymanager
views = self.states.view2d
if key == 'IMPORT':
@@ -367,14 +367,14 @@
java.io.File(fd.getDirectory()+fd.getFile()),
'application/pdf')
p('sc: ',sc,'foo: ', sc.getID())
- mgr.replaceManager(0,
+ buoymanager.replaceManager(0,
ff.view.buoy.FisheyeMainNode2D(sc, views.pageview,
ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),
self.states.mainMouse))
return 1
elif key == 'NEW_PAPER':
paper = self.states.pp.newPaper();
- mgr.replaceManager(0,
+ buoymanager.replaceManager(0,
ff.view.buoy.MainNode2D(ff.swamp.Nodes.get(paper),
views.irregu,
ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
self.states.mainMouse))
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/07
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/08
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/08
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/11
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...,
Matti Katila <=
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12
- [Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf..., Matti Katila, 2003/08/12