[Gzz-commits] gzz/lava gzz/loom/SimpleView.java test/gzz/loom...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/02/23 15:19:10

Modified files:
        lava/gzz/loom  : SimpleView.java 
        lava/test/gzz/loom: SimpleView.test 

Log message:
        Backward connections

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/SimpleView.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/SimpleView.test.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/SimpleView.java
diff -u gzz/lava/gzz/loom/SimpleView.java:1.20 
gzz/lava/gzz/loom/SimpleView.java:1.21
--- gzz/lava/gzz/loom/SimpleView.java:1.20      Sun Feb 23 14:44:24 2003
+++ gzz/lava/gzz/loom/SimpleView.java   Sun Feb 23 15:19:10 2003
@@ -76,5 +76,16 @@
            sc.map.put(conn, cs, cs2);
            y += 50;
        }
+
+       nodes = c.getConnections(-1);
+       x = midx - 75 - 50; y = midy-10-before*50;
+
+       for(Iterator j=nodes.iterator(); j.hasNext();) {
+           RDFNode node = (RDFNode)j.next();
+           int cs2 = sc.orthoBoxCS(into, node, 0, x, y, 1, 1, 50, 20);
+           nodeView.render(sc, cs2, node);
+           sc.map.put(conn, cs2, cs);
+           y += 50;
+       }
     }
 }
Index: gzz/lava/test/gzz/loom/SimpleView.test
diff -u gzz/lava/test/gzz/loom/SimpleView.test:1.13 
gzz/lava/test/gzz/loom/SimpleView.test:1.14
--- gzz/lava/test/gzz/loom/SimpleView.test:1.13 Sun Feb 23 11:50:27 2003
+++ gzz/lava/test/gzz/loom/SimpleView.test      Sun Feb 23 15:19:10 2003
@@ -31,6 +31,7 @@
 t = model.createResource()
 u = model.createResource()
 v = model.createResource()
+w = model.createResource()
 
 nodes = {}
 
@@ -40,7 +41,7 @@
 
 class Cmp(java.util.Comparator):
     def compare(self, r1, r2):
-        return [t,r,s,v,u].index(r1) - [t,r,s,v,u].index(r2)
+        return [t,r,s,v,u,w].index(r1) - [t,r,s,v,u,w].index(r2)
 
 view = gzz.loom.SimpleView(NodeView())
 
@@ -70,15 +71,18 @@
     r.addProperty(p, u)
     r.addProperty(p, v)
 
+    w.addProperty(p, r)
+
     vs = getvs()
     cursor = gzz.loom.Cursor(Cmp(), r, s)
     view.render(vs, 0, cursor)
 
-    cs_r, cs_s, cs_t, cs_u, cs_v = [vs.matcher.getCS(0, x)
-                                    for x in (r,s,t,u,v)]
+    cs_r, cs_s, cs_t, cs_u, cs_v, cs_w = \
+        [vs.matcher.getCS(0, x) for x in (r,s,t,u,v,w)]
 
-    pr, ps, pt, pu, pv = [vs.coords.transformPoint(cs, 0, 0, None)
-                          for cs in [cs_r, cs_s, cs_t, cs_u, cs_v]]
+    pr, ps, pt, pu, pv, pw = \
+        [vs.coords.transformPoint(cs, 0, 0, None)
+         for cs in [cs_r, cs_s, cs_t, cs_u, cs_v, cs_w]]
 
     arr = jarray.zeros(2, 'f')
     vs.coords.getSqSize(cs_r, arr)
@@ -90,15 +94,19 @@
     assert abs(pr.y+h_r/2-middle_y) < 3
 
     # s,t,u,v should be same size and on a single vertical line
-    assert ps.x == pt.x == pu.x == pv.x > pr.x
+    assert ps.x == pt.x == pu.x == pv.x > pr.x > pw.x
 
-    # s should be approx. the same height as r,
+    # s and w should be approx. the same height as r,
     # while t is above and v,u are below
-    assert pt.y < ps.y < pv.y < pu.y
-    assert abs(ps.y-pr.y) < 5
+    assert pt.y == pw.y < pr.y == ps.y < pv.y < pu.y
+
+    # distances on both sides should be equal
+    # this works only if all nodes are same size... XXX
+    assert (ps.x - pr.x) == (pr.x - pw.x)
 
     assert nodes[r] == cs_r
     assert nodes[s] == cs_s
     assert nodes[t] == cs_t
     assert nodes[u] == cs_u
     assert nodes[v] == cs_v
+    assert nodes[w] == cs_w