[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire test/fen.py view/PaperView2...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire test/fen.py view/PaperView2... |
Date: |
Thu, 08 May 2003 09:38:57 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/05/08 09:38:57
Modified files:
org/fenfire/test: fen.py
org/fenfire/view: PaperView2D.java papercanvas2d.test
Log message:
Tests now pass
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/fen.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/test/fen.py
diff -u fenfire/org/fenfire/test/fen.py:1.1 fenfire/org/fenfire/test/fen.py:1.2
--- fenfire/org/fenfire/test/fen.py:1.1 Thu May 8 09:30:31 2003
+++ fenfire/org/fenfire/test/fen.py Thu May 8 09:38:57 2003
@@ -2,9 +2,16 @@
# Helper routines for making "normal" fens
+import java
+
from org import fenfire as ff
+from org.nongnu import alph
+from org.nongnu import storm
def newFen():
+ pool = storm.impl.TransientPool(java.util.HashSet())
+ myalph = alph.impl.StormAlph(pool)
+
fen = ff.Fen()
fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.10
fenfire/org/fenfire/view/PaperView2D.java:1.11
--- fenfire/org/fenfire/view/PaperView2D.java:1.10 Fri May 2 20:57:00 2003
+++ fenfire/org/fenfire/view/PaperView2D.java Thu May 8 09:38:57 2003
@@ -12,7 +12,7 @@
* this other view is rendered on top of the paper.
*/
public class PaperView2D extends View2D {
-public static final String rcsid = "$Id: PaperView2D.java,v 1.10 2003/05/03
00:57:00 mudyc Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.11 2003/05/08
13:38:57 tjl Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PaperView2D::"+s); }
@@ -77,7 +77,12 @@
}
public void getSize(Object plane, float[] wh) {
- child.getSize(plane, wh);
+ if(child != null)
+ child.getSize(plane, wh);
+ else {
+ wh[0] = -1;
+ wh[1] = -1;
+ }
}
}
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.1
fenfire/org/fenfire/view/papercanvas2d.test:1.2
--- fenfire/org/fenfire/view/papercanvas2d.test:1.1 Thu May 8 09:22:44 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Thu May 8 09:38:57 2003
@@ -17,16 +17,16 @@
node1 = ff.swamp.Nodes.N()
node2 = ff.swamp.Nodes.N()
- ff.graph.add(nodec, PAPER.contains, node1)
- ff.graph.add(nodec, PAPER.contains, node2)
+ fen.graph.add(nodec, PAPER.contains, node1)
+ fen.graph.add(nodec, PAPER.contains, node2)
con.setText(node1, "XXX", 0)
con.setText(node2, "YYY", 0)
- ff.util.RDFUtil.setInt(node1, SPATIAL.coordX, 200)
- ff.util.RDFUtil.setInt(node1, SPATIAL.coordY, 100)
+ ff.util.RDFUtil.setInt(fen, node1, SPATIAL.coordX, 200)
+ ff.util.RDFUtil.setInt(fen, node1, SPATIAL.coordY, 100)
- ff.util.RDFUtil.setInt(node2, SPATIAL.coordX, 200)
- ff.util.RDFUtil.setInt(node2, SPATIAL.coordY, 500)
+ ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordX, 200)
+ ff.util.RDFUtil.setInt(fen, node2, SPATIAL.coordY, 500)
vs = ff.test.gfx.getvs()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire test/fen.py view/PaperView2...,
Tuomas J. Lukka <=