[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/... |
Date: |
Sat, 03 May 2003 06:15:02 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Benja Fallenstein <address@hidden> 03/05/03 06:15:02
Modified files:
org/fenfire/demo: buoyoing.py
org/fenfire/view/buoy: PPConnector.java
Log message:
Show only the connected part of connected PP canvases
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.38
fenfire/org/fenfire/demo/buoyoing.py:1.39
--- fenfire/org/fenfire/demo/buoyoing.py:1.38 Sat May 3 06:04:48 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Sat May 3 06:15:02 2003
@@ -137,7 +137,8 @@
#connector.hackForTesting = 1
ppconnector = ff.view.buoy.PPConnector(fen, irregu,
- ff.view.buoy.MainNode2D.MainNode2DFactory(1))
+ ff.view.buoy.MainNode2D.MainNode2DFactory(1),
+ nodeview)
tconnector = ff.view.buoy.TransclusionConnector(fen)
#pagescroll2d = ff.view.IrregularViewportView2D(
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.8
fenfire/org/fenfire/view/buoy/PPConnector.java:1.9
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.8 Fri May 2 20:57:00 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Sat May 3 06:15:02 2003
@@ -10,13 +10,14 @@
import org.nongnu.libvob.*;
import org.nongnu.libvob.buoy.*;
import org.nongnu.libvob.impl.DefaultVobMatcher;
+import org.nongnu.libvob.lava.placeable.Placeable;
import java.util.Iterator;
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.8 2003/05/03
00:57:00 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.9 2003/05/03
10:15:02 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -25,11 +26,20 @@
private Fen fen;
private View2D view2d;
private BuoyViewNodeType nodeType;
+
+ /** A node view used to determine the size of items
+ * on the canvas, so that the appropriate rectangle to show
+ * can be determined.
+ */
+ private NodeFunction nodeView;
+
public PPConnector(Fen fen, View2D view2d,
- AbstractMainNode2D.Factory factory) {
+ AbstractMainNode2D.Factory factory,
+ NodeFunction nodeView) {
this.fen = fen;
this.view2d = view2d;
this.nodeType = new NodeType2D(view2d, factory);
+ this.nodeView = nodeView;
}
public void addBuoys(VobScene vs, int parentCs,
@@ -75,11 +85,14 @@
}
}
- public int dx = -100, dy = -200, w = 400, h = 400;
+ public int dx = 30, dy = 30;
protected java.awt.Rectangle getRect(Object node) {
if (node == null) throw new Error("Impossible!");
int x = RDFUtil.getInt(fen, node, SPATIAL.coordX);
int y = RDFUtil.getInt(fen, node, SPATIAL.coordY);
- return new java.awt.Rectangle(x+dx, y+dy, w, h);
+ Placeable p = (Placeable)nodeView.f(fen.constgraph, node);
+ return new java.awt.Rectangle(x-dx, y-dy,
+ (int)p.getWidth()+dx+dx,
+ (int)p.getHeight()+dy+dy);
}
}
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Benja Fallenstein, 2003/05/03
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/...,
Benja Fallenstein <=
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Benja Fallenstein, 2003/05/03
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Benja Fallenstein, 2003/05/03
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Matti Katila, 2003/05/15
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Matti Katila, 2003/05/19
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Matti Katila, 2003/05/19
- [Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/buoy/..., Matti Katila, 2003/05/23