[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire docs/pegboard/fenpdf_v1_spec_1--tjl/peg...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] fenfire docs/pegboard/fenpdf_v1_spec_1--tjl/peg... |
|
Date: |
Wed, 30 Jul 2003 08:38:32 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/07/30 08:38:32
Modified files:
docs/pegboard/fenpdf_v1_spec_1--tjl: peg.rst
org/fenfire : NodeContent.java
org/fenfire/view: View2D.java
org/fenfire/view/buoy: PPConnector.java
TransclusionConnector.java
org/fenfire/view/lava: ContextNodeView.java
Log message:
Use Anchor objects instead of triplets. No tests fail but it doesn't
quite work yet because the places where they are expected haven't been updated.
Failing tests and fixes coming shortly
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/NodeContent.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/View2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/ContextNodeView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst
diff -u fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.5
fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.6
--- fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst:1.5 Wed Jul 30
05:48:17 2003
+++ fenfire/docs/pegboard/fenpdf_v1_spec_1--tjl/peg.rst Wed Jul 30 08:38:32 2003
@@ -4,8 +4,8 @@
:Authors: Tuomas J. Lukka
:Date-Created: 2003-07-28
-:Last-Modified: $Date: 2003/07/30 09:48:17 $
-:Revision: $Revision: 1.5 $
+:Last-Modified: $Date: 2003/07/30 12:38:32 $
+:Revision: $Revision: 1.6 $
:Status: Incomplete
:Stakeholders: benja, mudyc, humppake
:Scope: Major
@@ -166,7 +166,7 @@
Foci
----
-Two foci, shown on top
+Two foci, shown on top of each other.
Buoy placement
--------------
@@ -261,5 +261,6 @@
Versioning / Merging
====================
+At first, in research use, merge using CVS for the RDF.
Index: fenfire/org/fenfire/NodeContent.java
diff -u fenfire/org/fenfire/NodeContent.java:1.5
fenfire/org/fenfire/NodeContent.java:1.6
--- fenfire/org/fenfire/NodeContent.java:1.5 Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/NodeContent.java Wed Jul 30 08:38:32 2003
@@ -35,7 +35,7 @@
* which returns the Enfilade1D for a given
* node.
*/
- public org.fenfire.swamp.NodeFunction getNodeFunction() ;
+ org.fenfire.swamp.NodeFunction getNodeFunction() ;
/** Set the vstream in this node.
*/
Index: fenfire/org/fenfire/view/View2D.java
diff -u fenfire/org/fenfire/view/View2D.java:1.6
fenfire/org/fenfire/view/View2D.java:1.7
--- fenfire/org/fenfire/view/View2D.java:1.6 Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/view/View2D.java Wed Jul 30 08:38:32 2003
@@ -32,6 +32,26 @@
* an HTML file rendered into a 2D plane.
*/
public abstract class View2D {
+
+ /** An anchor: a given node / location on a given plane.
+ */
+ static public class Anchor {
+ public Anchor(Object plane, float x,
+ float y,
+ float w,
+ float h, Object node) {
+ this.plane = plane;
+ this.x = x;
+ this.y = y;
+ this.w = w;
+ this.h = h;
+ this.node = node;
+ }
+ public final Object plane;
+ public final float x, y, w, h;
+ public final Object node;
+ }
+
/** Render this view.
* The view is a rectangular area of the whole 2D plane.
* (For PP canvases, which are infinitely large, we
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.18
fenfire/org/fenfire/view/buoy/PPConnector.java:1.19
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.18 Wed Jul 30 05:11:46 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java Wed Jul 30 08:38:32 2003
@@ -40,7 +40,7 @@
/** Make the kinds of links familiar from PP structure.
*/
public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.18 2003/07/30
09:11:46 tjl Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.19 2003/07/30
12:38:32 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPConnector::"+s); }
@@ -94,8 +94,8 @@
Object obj = iter.next();
Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
if (container == plane) continue;
- Object anchor = new Triple(plane, getRect(obj), obj);
- if (dbg) pa("rect:"+getRect(obj));
+ Object anchor = getAnchor(plane, obj);
+ if (dbg) pa("rect:"+anchor);
l.link(1, cs, nodeType, new Pair(node, obj), anchor, shift);
shift++;
}
@@ -107,8 +107,8 @@
Object obj = iter.next();
Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
if (container == plane) continue;
- Object anchor = new Triple(plane, getRect(obj), obj);
- if (dbg) pa("rect:"+getRect(obj));
+ Object anchor = getAnchor(plane, obj);
+ if (dbg) pa("rect:"+anchor);
l.link(-1, cs, nodeType, new Pair(obj, node), anchor, shift);
shift++;
}
@@ -116,14 +116,16 @@
}
public int dx = 30, dy = 30;
- protected java.awt.Rectangle getRect(Object node) {
+ protected View2D.Anchor getAnchor(Object plane, Object node) {
if (node == null) throw new Error("Impossible!");
float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
org.nongnu.libvob.lava.placeable.Placeable p =
(org.nongnu.libvob.lava.placeable.Placeable)nodeView.f(fen.constgraph, node);
- return new java.awt.Rectangle((int)(x-dx), (int)(y-dy),
- (int)p.getWidth()+dx+dx,
- (int)p.getHeight()+dy+dy);
+ return new View2D.Anchor(plane,
+ x-dx, y-dy,
+ p.getWidth()+dx+dx,
+ p.getHeight()+dy+dy,
+ node);
}
}
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.17
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.18
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.17 Wed Jul
30 05:11:46 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java Wed Jul 30
08:38:32 2003
@@ -44,7 +44,7 @@
/** Hang transclusion buoys.
*/
public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.17
2003/07/30 09:11:46 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.18
2003/07/30 12:38:32 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) {
System.out.println("TransclusionConnector:: "+s); }
@@ -148,7 +148,7 @@
if(dbg) pa("No plane!");
continue;
}
- Object anchor = new Triple(plane, getRect(node), null);
+ Object anchor = getAnchor(plane, node);
l.link(-1, cs, normalNodeNodeType,
new Pair(node, span.getScrollBlock()),
anchor);
@@ -161,7 +161,7 @@
}
public float mx = 1.1f, my = 1.1f;
- protected java.awt.Rectangle getRect(Object node) {
+ protected View2D.Anchor getAnchor(Object plane, Object node) {
if (node == null) throw new Error("Impossible!");
float x = RDFUtil.getFloat(fen.graph, node, CANVAS2D.x);
float y = RDFUtil.getFloat(fen.graph, node, CANVAS2D.y);
@@ -171,8 +171,8 @@
float h = p.getHeight();
int bw = (int)(mx * w);
int bh = (int)(my * h);
- return new java.awt.Rectangle((int)(x-bw), (int)(y-bh),
- (int)w+2*bw,
- (int)h+2*bh);
+ return new View2D.Anchor(plane,
+ x-bw, y-bh, w+2*bw, h+2*bh,
+ node);
}
}
Index: fenfire/org/fenfire/view/lava/ContextNodeView.java
diff -u fenfire/org/fenfire/view/lava/ContextNodeView.java:1.3
fenfire/org/fenfire/view/lava/ContextNodeView.java:1.4
--- fenfire/org/fenfire/view/lava/ContextNodeView.java:1.3 Tue Jul 1
12:33:33 2003
+++ fenfire/org/fenfire/view/lava/ContextNodeView.java Wed Jul 30 08:38:32 2003
@@ -71,7 +71,7 @@
public interface Context {
- public void isCurrent(Object node, ContextNodeView nv);
+ void isCurrent(Object node, ContextNodeView nv);
}
}