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

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    03/02/27 05:45:38

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

Log message:
        depth for wheelview, but failed to test it...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/WheelView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/WheelView.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/WheelView.java
diff -u gzz/lava/gzz/loom/WheelView.java:1.1 
gzz/lava/gzz/loom/WheelView.java:1.2
--- gzz/lava/gzz/loom/WheelView.java:1.1        Wed Feb 26 15:19:22 2003
+++ gzz/lava/gzz/loom/WheelView.java    Thu Feb 27 05:45:38 2003
@@ -84,13 +84,14 @@
        double cura = -(before * rota);
        for(Iterator j=c.getConnections(1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
-           int cs2 = sc.orthoBoxCS(into, node, 0,
+           int cs2 = sc.orthoBoxCS(into, node, Math.abs(before),
                                    midx+x(cura, r)-sizex/2,
                                    midy+y(cura, r)-sizey/2,
                                    1, 1, sizex, sizey);
            nodeView.render(sc, cs2, node, 1);
            sc.map.put(conn, cs, cs2);    
            cura+=rota;
+           before--;
        }
 
        /* Negward connections */
@@ -98,13 +99,14 @@
        cura = Math.PI-(before * rota);
        for(Iterator j=c.getConnections(-1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
-           int cs2 = sc.orthoBoxCS(into, node, 0,
+           int cs2 = sc.orthoBoxCS(into, node, Math.abs(before),
                                    midx+x(cura, r)-sizex/2,
                                    midy+y(cura, r)-sizey/2,
                                    1, 1, sizex, sizey);
            nodeView.render(sc, cs2, node, -1);
            sc.map.put(conn, cs2, cs);
            cura+=rota;
+           before--;
        }
     }
 
Index: gzz/lava/test/gzz/loom/WheelView.test
diff -u gzz/lava/test/gzz/loom/WheelView.test:1.5 
gzz/lava/test/gzz/loom/WheelView.test:1.6
--- gzz/lava/test/gzz/loom/WheelView.test:1.5   Thu Feb 27 05:18:28 2003
+++ gzz/lava/test/gzz/loom/WheelView.test       Thu Feb 27 05:45:38 2003
@@ -92,11 +92,14 @@
     # Check that selected nodes are drawn on same level
 
     assert pw.y == pr.y == ps.y
+    # XXX assert pw.z == pr.z == ps.z
 
     # Check that the positive side of the wheel seem to turn right
 
     assert pt.y < ps.y < pv.y
     assert pt.x < ps.x > pv.x
+    # XXX assert pt.z > ps.z < pv.z < pu.z
+       
 
     # Check that all nodes have approximately the same distance
     # from r