[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/lava/...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/lava/... |
Date: |
Fri, 16 May 2003 08:14:35 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/05/16 08:14:34
Modified files:
org/fenfire/demo: buoyoing.py
org/fenfire/view/lava: FenPDFContext.java
Log message:
Dual buoys\!
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FenPDFContext.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.49
fenfire/org/fenfire/demo/buoyoing.py:1.50
--- fenfire/org/fenfire/demo/buoyoing.py:1.49 Fri May 16 06:38:16 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Fri May 16 08:14:34 2003
@@ -135,6 +135,7 @@
plane = Nodes.get(paperA)
mainNode = ff.view.buoy.MainNode2D(plane, irregu)
+mainNode2 = ff.view.buoy.MainNode2D(plane, irregu)
#mainNode = ff.view.buoy.MainNode2D(plane, paperview)
#connector = ff.view.buoy.PPConnector(fen, paperviewonly)
@@ -155,10 +156,40 @@
tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2DFull(pagescroll2d,
ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory())
+class DoubleGeometer:
+ def place(self, vs):
+ ctrx = vs.size.width / 2
+ ctry = vs.size.height * .485 # A *little* above real ctr
+
+ mainsize = vs.size.width * .6
+
+ buoywidth = vs.size.width * .5
+ buoyheight = vs.size.height * .8
+
+ into1 = vs.orthoBoxCS(0, "FocusFrame1", 0,
+ ctrx -.5*mainsize, .5 * ctry -.25*mainsize,
+ 1, 1, mainsize, .5*mainsize)
+
+ into2 = vs.orthoBoxCS(0, "FocusFrame2", 0,
+ ctrx -.5*mainsize, 1.5 * ctry -.25*mainsize,
+ 1, 1, mainsize, .5*mainsize)
+
+ buoyinto1 = vs.orthoBoxCS(0, "BuoyFrame1", 0,
+ ctrx -buoywidth/2, .5 * ctry -buoyheight/2, 1,
1,
+ buoywidth, buoyheight)
+
+ buoyinto2 = vs.orthoBoxCS(0, "BuoyFrame2", 0,
+ ctrx -buoywidth/2, 1.5 * ctry -buoyheight/2, 1,
1,
+ buoywidth, buoyheight)
+
+ return [(into1, buoyinto1), (into2, buoyinto2)]
+
+
class Scene(vob.buoy.buoymanager.MultiBuoyManager):
def __init__(self):
- vob.buoy.buoymanager.MultiBuoyManager.__init__(self, [mainNode],
[ppconnector, tconnector],
- vob.buoy.buoymanager.SingleGeometer())
+ vob.buoy.buoymanager.MultiBuoyManager.__init__(self,
+ [mainNode, mainNode2], [ppconnector, tconnector],
+ DoubleGeometer())
currentScene = Scene()
Index: fenfire/org/fenfire/view/lava/FenPDFContext.java
diff -u fenfire/org/fenfire/view/lava/FenPDFContext.java:1.12
fenfire/org/fenfire/view/lava/FenPDFContext.java:1.13
--- fenfire/org/fenfire/view/lava/FenPDFContext.java:1.12 Fri May 16
07:44:18 2003
+++ fenfire/org/fenfire/view/lava/FenPDFContext.java Fri May 16 08:14:34 2003
@@ -152,6 +152,7 @@
AbstractMainNode2D main) {
if (e.getID() != MouseEvent.MOUSE_CLICKED) return false;
int cs = oldVS.coords.getCSAt(0, e.getX(), e.getY(), null);
+ if(cs < 0) return false;
Object obKey = oldVS.matcher.getKey(cs);
if (obKey == null) return false;
if (obKey instanceof String) {
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/lava/...,
Tuomas J. Lukka <=