[ff-cvs] libvob org/nongnu/libvob/buoy/BuoyGeometer.java...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/16 06:29:37

Modified files:
        org/nongnu/libvob/buoy: BuoyGeometer.java BuoyViewNodeType.java 
        vob/buoy       : buoymanager.py 

Log message:
        Tentatively implement option 2 for dealing with buoy getSqSize. Works.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyGeometer.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.56&tr2=1.57&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/buoy/BuoyGeometer.java
diff -u libvob/org/nongnu/libvob/buoy/BuoyGeometer.java:1.5 
libvob/org/nongnu/libvob/buoy/BuoyGeometer.java:1.6
--- libvob/org/nongnu/libvob/buoy/BuoyGeometer.java:1.5 Mon Aug 11 04:59:21 2003
+++ libvob/org/nongnu/libvob/buoy/BuoyGeometer.java     Sat Aug 16 06:29:37 2003
@@ -62,7 +62,7 @@
      * @param total The total number of buoys from the anchor
      *         (might be inaccurate)
      * @param w,h The size the buoy should be closest
-     * to the focus.
+     * to the focus. This should be the box size of the CS returned.
      * @param scale The scale that should be applied to the w, h at
      * focus
      */
Index: libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java
diff -u libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.2 
libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.3
--- libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java:1.2     Thu Apr 24 
14:41:52 2003
+++ libvob/org/nongnu/libvob/buoy/BuoyViewNodeType.java Sat Aug 16 06:29:37 2003
@@ -44,9 +44,13 @@
      * The box should be filled <b>completely</b> because it will
      * be used for sensing mouse clicks to this buoy
      * (XXX kludge! Will change later)
+     * @param w Box width. Do not call getSqSize() on into, since
+     *                 this buoy might be culled at generation time.
+     * @param h Box height
      * @return The coordinate system of the anchor
      */
-    int renderBuoy(VobScene vs, int into, Object linkId, Object anchor,
+    int renderBuoy(VobScene vs, int into, float w, float h,
+                       Object linkId, Object anchor,
                        Object cachedSize);
 
     /** Focus was set to the buoy -- create an object that knows
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.56 libvob/vob/buoy/buoymanager.py:1.57
--- libvob/vob/buoy/buoymanager.py:1.56 Thu Aug 14 04:07:52 2003
+++ libvob/vob/buoy/buoymanager.py      Sat Aug 16 06:29:37 2003
@@ -167,7 +167,7 @@
 
        ### Render the buoy, get back anchor cs
        if dbg: pa("Render buoy ",into, linkId, otherAnchor)
-       otherAnchorCS = otherNode.renderBuoy(self.vs, into, linkId, 
otherAnchor, None)
+       otherAnchorCS = otherNode.renderBuoy(self.vs, into, w, h, linkId, 
otherAnchor, None)
        self.cs[into] = (otherNode, linkId, otherAnchor, into)
 
        if anchorCS >= 0: