[ff-cvs] fenfire/org/fenfire/view/buoy NodeType2D.java N...

[Tuomas J. Lukka]

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

Modified files:
        org/fenfire/view/buoy: NodeType2D.java NodeType2DFull.java 

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

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2DFull.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.15 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.16
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.15  Thu Jul 31 06:08:05 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Sat Aug 16 06:29:40 2003
@@ -60,7 +60,10 @@
        return null;
     }
 
-    public int renderBuoy(VobScene vs, int into, Object linkId,
+    public int renderBuoy(VobScene vs, 
+                           int into, 
+                           float w, float h,
+                           Object linkId,
                          Object a, Object cachedSize) {
        if (dbg) p("start renderBuoy");
        if(effigy != 0) {
@@ -70,9 +73,6 @@
        }
        View2D.Anchor anchor = (View2D.Anchor)a;
 
-       float[] tmp = new float[2];
-       vs.coords.getSqSize(into, tmp);
-       float w = tmp[0], h = tmp[1];
        if (dbg) p("rect "+anchor+" coords "+w+","+h);
 
        float scale = w / anchor.w;
Index: fenfire/org/fenfire/view/buoy/NodeType2DFull.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.8 
fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.9
--- fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.8       Wed Jul 30 
11:46:45 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2DFull.java   Sat Aug 16 06:29:40 2003
@@ -57,7 +57,7 @@
 
     float [] tmpSize = new float[2];
     float [] tmpSqSize = new float[2];
-    public int renderBuoy(VobScene vs, int into, Object linkId,
+    public int renderBuoy(VobScene vs, int into, float w, float h, Object 
linkId,
                          Object anchor, Object cachedSize) {
        if (dbg) pa("renderBuoy");
        if(effigy != 0) {
@@ -68,16 +68,15 @@
        View2D.Anchor a = (View2D.Anchor)anchor;
 
        view2d.getSize(a.plane, tmpSize);
-       vs.coords.getSqSize(into, tmpSqSize);
 
        
-       float scale1 = tmpSize[0] / tmpSqSize[0];
-       float scale2 = tmpSize[1] / tmpSqSize[1];
+       float scale1 = tmpSize[0] / w;
+       float scale2 = tmpSize[1] / h;
        float scale = (scale1 < scale2 ? scale1 : scale2);
 
        int box2paper = vs.coords.orthoBox(0, 0, 0, 0, 
                                           scale, scale, 
-                                          tmpSqSize[0], tmpSqSize[1]);
+                                          w, h);
        vs.matcher.add(into, box2paper, "BOX2PAPER");
 
        view2d.render(vs, a.plane, into, into, box2paper);