[Gzz-commits] gzz ./TODO gzz/gfx/gl/GLVobCoorder.java gzz/vie...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/04 16:16:31

Modified files:
        .              : TODO 
        gzz/gfx/gl     : GLVobCoorder.java 
        gzz/view/buoy  : BuoyAdaptor.java 
        gzz/vob        : VobScene.java 
        test/gzz/view/buoy: buoysys.test 
Added files:
        gfx/demo       : buoyoing.py 
        gzz/view/buoy  : buoymanager.py 

Log message:
        Trying to get primitive buoyoing user interface moving

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.552&tr2=1.553&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLVobCoorder.java.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/BuoyAdaptor.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobScene.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/buoy/buoysys.test.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.552 gzz/TODO:1.553
--- gzz/TODO:1.552      Tue Feb  4 12:35:36 2003
+++ gzz/TODO    Tue Feb  4 16:16:31 2003
@@ -16,6 +16,8 @@
 HT03 deadline:
     tjl:
        - the great buoy redesign
+           - make pagespan nodes show just the span, when
+             shown as buoys!
            - figure out how scrollblock nodes shall be linked back 
              with right
              coordsys
Index: gzz/gzz/gfx/gl/GLVobCoorder.java
diff -u gzz/gzz/gfx/gl/GLVobCoorder.java:1.62 
gzz/gzz/gfx/gl/GLVobCoorder.java:1.63
--- gzz/gzz/gfx/gl/GLVobCoorder.java:1.62       Fri Dec  6 06:44:05 2002
+++ gzz/gzz/gfx/gl/GLVobCoorder.java    Tue Feb  4 16:16:31 2003
@@ -31,7 +31,7 @@
 import gzz.client.gl.*;
 
 public class GLVobCoorder extends AffineVobCoorder {
-public static final String rcsid = "$Id: GLVobCoorder.java,v 1.62 2002/12/06 
11:44:05 tjl Exp $";
+public static final String rcsid = "$Id: GLVobCoorder.java,v 1.63 2003/02/04 
21:16:31 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -212,13 +212,13 @@
 
     public int buoyOnCircle(int into, int anchor, float cx, float cy, 
                        float rad, float px, float py, 
-                       float pointdir) {
+                       float shiftamount) {
        floats[nfloats + 0] = cx;
        floats[nfloats + 1] = cy;
        floats[nfloats + 2] = rad;
        floats[nfloats + 3] = px;
        floats[nfloats + 4] = py;
-       floats[nfloats + 5] = pointdir;
+       floats[nfloats + 5] = shiftamount;
        int paramInd = nfloats;
        nfloats += 6;
 
Index: gzz/gzz/view/buoy/BuoyAdaptor.java
diff -u gzz/gzz/view/buoy/BuoyAdaptor.java:1.5 
gzz/gzz/view/buoy/BuoyAdaptor.java:1.6
--- gzz/gzz/view/buoy/BuoyAdaptor.java:1.5      Tue Feb  4 10:09:51 2003
+++ gzz/gzz/view/buoy/BuoyAdaptor.java  Tue Feb  4 16:16:31 2003
@@ -53,7 +53,8 @@
        throw new Error("Unknown anchor!");
     }
 
-    /** An adaptor class that call
+    /** An adaptor class that calls the cellLinkers
+     * for each cell placed by the CellBuoyViewNodes.
      */
     private class LinkAdaptor implements CellPlacementHook {
        LinkAdaptor(BuoyLinkListener l) { this.l = l; }
Index: gzz/gzz/vob/VobScene.java
diff -u gzz/gzz/vob/VobScene.java:1.25 gzz/gzz/vob/VobScene.java:1.26
--- gzz/gzz/vob/VobScene.java:1.25      Sat Jan 25 06:01:48 2003
+++ gzz/gzz/vob/VobScene.java   Tue Feb  4 16:16:31 2003
@@ -178,7 +178,10 @@
     public int boxCS(int into, Object key, float w, float h) {
        return matcher.add(into, coords.box(into, w, h), key);
     }
-    public int orthoBoxCS(int into, Object key, float d, float x, float y, 
float sx, float sy, float w, float h) {
+    public int orthoBoxCS(int into, Object key, 
+                           float d, float x, float y, 
+                           float sx, float sy, 
+                           float w, float h) {
        return matcher.add(into, coords.orthoBox(into, d, x, y, sx, sy, w, h), 
key);
     }
 
Index: gzz/test/gzz/view/buoy/buoysys.test
diff -u gzz/test/gzz/view/buoy/buoysys.test:1.11 
gzz/test/gzz/view/buoy/buoysys.test:1.12
--- gzz/test/gzz/view/buoy/buoysys.test:1.11    Tue Feb  4 10:02:59 2003
+++ gzz/test/gzz/view/buoy/buoysys.test Tue Feb  4 16:16:31 2003
@@ -6,12 +6,13 @@
 import test
 from test.tools.gfx import *
 
+from gzz.zzutil import Ids
+
 from gzz.view.buoy import zzNodes
 from gzz.view.buoy import pagespanNodes
 from gzz.view.buoy import BuoyLinkListener, ScrollblockCellLinker
 from gzz.view.buoy import BuoyAdaptor
 
-from gzz.zzutil import Ids
 
 
 # The test pageimagescroll