[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/view SpatialPlane.java Cont...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/view SpatialPlane.java Cont... |
Date: |
Tue, 08 Apr 2003 10:56:52 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/08 10:56:52
Modified files:
org/fenfire/view: SpatialPlane.java
Added files:
org/fenfire/view: ContentHandler.java DefaultNodeView.java
NodeContent.java NodeContentView.java
NodeContentViewHandler.java SimpleText.java
TextContentView.java TextHandler.java
TextState.java ViewContext.java
Removed files:
org/fenfire/view: NodeView.java
Log message:
i'll write pegs after, now is time for implementation..
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/ContentHandler.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodeContent.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodeContentView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/NodeContentViewHandler.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SimpleText.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextContentView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextHandler.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextState.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/ViewContext.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.4
fenfire/org/fenfire/view/SpatialPlane.java:1.5
--- fenfire/org/fenfire/view/SpatialPlane.java:1.4 Sat Apr 5 15:26:35 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Tue Apr 8 10:56:52 2003
@@ -26,7 +26,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.4 2003/04/05
20:26:35 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.5 2003/04/08
14:56:52 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SpatialPlane::"+s);
}
@@ -50,15 +50,14 @@
public void renderAWT(VobScene vs, int into, int geom,
- RDFNode node, Space space,
- NodePlacementHook hook)
+ RDFNode node, NodeView nodeview,
+ Model model, NodePlacementHook hook)
{ try {
- Model mod = space.getModel();
RDFNode current = node;
RDFNode container = current;
- if (ShortRDF.isNodeType(mod, current, cType)) {
- container = ShortRDF.getSubj(mod, current, cont);
+ if (ShortRDF.isNodeType(model, current, cType)) {
+ container = ShortRDF.getSubj(model, current, cont);
}
@@ -79,58 +78,27 @@
Selector slctr = new SelectorImpl((Resource)container, cont, (RDFNode)
null);
- StmtIterator iter = mod.listStatements(slctr);
+ StmtIterator iter = model.listStatements(slctr);
Statement stmt = null;
while (iter.hasNext()) {
RDFNode n = (RDFNode)((Statement)iter.next()).getObject();
- Enfilade1D enf = space.getEnfilade(n);
- if (enf == null) continue;
-
- java.util.List enfList = enf.getList();
- Span1D span = (Span1D) enfList.get(0);
-
- int[] coords = new int[2];
-
// get coords
- coords[0] = ShortRDF.getInt(mod, n, SPATIAL.coordX);
- coords[1] = ShortRDF.getInt(mod, n, SPATIAL.coordY);
+ int[] coords = new int[2];
+ coords[0] = ShortRDF.getInt(model, n, SPATIAL.coordX);
+ coords[1] = ShortRDF.getInt(model, n, SPATIAL.coordY);
// get size XXX
-
- Pair matchKey = new Pair(container, n);
-
- // XXX
- bs[0] = 30; bs[1] = 30;
- //pa("x: "+ (pt[0] + (pan[0] + coords[0]) * zoom) +
- // ", y: "+ (pt[1] + (pan[1] + coords[1]) * zoom));
-
- int box;
- box = vs.orthoBoxCS(0, matchKey, 100,
- pt[0] + (pan[0] + coords[0]) * zoom,
- pt[1] + (pan[1] + coords[1]) * zoom,
- 1, 1, bs[0], bs[1]);
-
-
- vs.put(new org.nongnu.libvob.vobs.RectBgVob(java.awt.Color.red),
box);
-
- if (span instanceof TextSpan) {
- String s = enf.toString();
-
-
- // nothing
- //pa("Text!, ooh..");
- } // PageSpan!!!
- else {
- pa("pagespan!, ooh..");
- }
-
+ nodeview.getSize(n, bs, zoom);
+ Pair matchKey = new Pair(container, n);
+ int box = vs.orthoCS(0, matchKey, 50,
+ pt[0] + (pan[0] + coords[0]) * zoom,
+ pt[1] + (pan[1] + coords[1]) * zoom,
+ bs[0], bs[1]);
+ nodeview.place(n, vs, box);
hook.placed(n, vs, box);
-
- //if (drawFrame)
- // vs.map.put(frame, box);
-
+ //vs.put(new org.nongnu.libvob.vobs.RectBgVob(java.awt.Color.red),
box);
}
/*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire/view SpatialPlane.java Cont...,
Matti Katila <=