[Gzz-commits] gzz/lava gzz/loom/Cursor.java gzz/loom/Loom.jav...

[Tuukka Hastrup]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuukka Hastrup <address@hidden> 03/02/26 13:03:55

Modified files:
        lava/gzz/loom  : Cursor.java Loom.java NodeView.java 
                         SimpleView.java 
        lava/test/gzz/loom: SimpleView.test 

Log message:
        color selected row in red

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Cursor.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Loom.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/NodeView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/SimpleView.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/SimpleView.test.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/Cursor.java
diff -u gzz/lava/gzz/loom/Cursor.java:1.11 gzz/lava/gzz/loom/Cursor.java:1.12
--- gzz/lava/gzz/loom/Cursor.java:1.11  Wed Feb 26 12:13:07 2003
+++ gzz/lava/gzz/loom/Cursor.java       Wed Feb 26 13:03:54 2003
@@ -155,6 +155,8 @@
     }
 
     public RDFNode getRotationNode(int dir) {
+       if(dir == 0)
+           return focus;
        Iterator iter = getConnections(dir).iterator();
        int n = getRotationIndex(dir);
        if(n < 0) 
Index: gzz/lava/gzz/loom/Loom.java
diff -u gzz/lava/gzz/loom/Loom.java:1.8 gzz/lava/gzz/loom/Loom.java:1.9
--- gzz/lava/gzz/loom/Loom.java:1.8     Sun Feb 23 18:44:56 2003
+++ gzz/lava/gzz/loom/Loom.java Wed Feb 26 13:03:55 2003
@@ -64,10 +64,16 @@
            new Cursor(order, stmt.getSubject(), 1, stmt.getObject());
 
        final Vob bg = new RectBgVob();
+       final RectBgVob selectionbg = new RectBgVob();
+       selectionbg.setBg(Color.red);
        final TextStyle style = api.getTextStyle("Serif", 0, 12);
        final NodeView nodeView = new NodeView() {
-               public void render(VobScene sc, int into, RDFNode node) {
-                   sc.map.put(bg, into);
+               public void render(VobScene sc, int into, RDFNode node, 
+                                  int dir) {
+                   if(node.equals(cursor.getRotationNode(dir)))
+                       sc.map.put(selectionbg, into);
+                   else
+                       sc.map.put(bg, into);
                    String s = node.toString();
                    if(s.length() > 25) s = s.substring(s.length()-25);
                    sc.map.put(new TextVob(style, s), 
Index: gzz/lava/gzz/loom/NodeView.java
diff -u gzz/lava/gzz/loom/NodeView.java:1.1 gzz/lava/gzz/loom/NodeView.java:1.2
--- gzz/lava/gzz/loom/NodeView.java:1.1 Sat Feb 22 19:33:30 2003
+++ gzz/lava/gzz/loom/NodeView.java     Wed Feb 26 13:03:55 2003
@@ -35,7 +35,7 @@
 public interface NodeView {
 
     /** Render a node. */
-    void render(VobScene vs, int into, RDFNode node);
+    void render(VobScene vs, int into, RDFNode node, int dir);
 
     /** Get the default size of a node.
      * @param node The node to get size for, or null for a default size.
Index: gzz/lava/gzz/loom/SimpleView.java
diff -u gzz/lava/gzz/loom/SimpleView.java:1.24 
gzz/lava/gzz/loom/SimpleView.java:1.25
--- gzz/lava/gzz/loom/SimpleView.java:1.24      Wed Feb 26 11:55:36 2003
+++ gzz/lava/gzz/loom/SimpleView.java   Wed Feb 26 13:03:55 2003
@@ -61,7 +61,7 @@
        int midx = sc.size.width/2, midy = sc.size.height/2;
        int cs = sc.orthoBoxCS(into, c.focus, 0, midx-sizex/2, midy-sizey/2, 
                               1, 1, sizex, sizey);
-       nodeView.render(sc, cs, c.focus);
+       nodeView.render(sc, cs, c.focus, 0);
        
        int before = c.getRotationIndex(1);
        
@@ -71,7 +71,7 @@
        for(Iterator j=c.getConnections(1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
            int cs2 = sc.orthoBoxCS(into, node, 0, x, y, 1, 1, sizex, sizey);
-           nodeView.render(sc, cs2, node);
+           nodeView.render(sc, cs2, node, 1);
            sc.map.put(conn, cs, cs2);
            y += sizey + gapy;
        }
@@ -83,7 +83,7 @@
        for(Iterator j=c.getConnections(-1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
            int cs2 = sc.orthoBoxCS(into, node, 0, x, y, 1, 1, sizex, sizey);
-           nodeView.render(sc, cs2, node);
+           nodeView.render(sc, cs2, node, -1);
            sc.map.put(conn, cs2, cs);
            y += sizey + gapy;
        }
Index: gzz/lava/test/gzz/loom/SimpleView.test
diff -u gzz/lava/test/gzz/loom/SimpleView.test:1.16 
gzz/lava/test/gzz/loom/SimpleView.test:1.17
--- gzz/lava/test/gzz/loom/SimpleView.test:1.16 Wed Feb 26 11:55:37 2003
+++ gzz/lava/test/gzz/loom/SimpleView.test      Wed Feb 26 13:03:55 2003
@@ -36,7 +36,7 @@
 nodes = {}
 
 class NodeView(gzz.loom.NodeView):
-    def render(self, vs, cs, node):
+    def render(self, vs, cs, node, dir):
         nodes[node] = cs
 
 class Cmp(java.util.Comparator):