[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/Canva...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/25 10:43:04

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: CanvasView2D.java IrregularViewportView2D.java 
                          TextNodeView.java 
        org/fenfire/view/buoy: NodeType2D.java 

Log message:
        Adding keys helps: doesn't flicker when animating

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/IrregularViewportView2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.24 
fenfire/org/fenfire/demo/buoyoing.py:1.25
--- fenfire/org/fenfire/demo/buoyoing.py:1.24   Fri Apr 25 09:57:07 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri Apr 25 10:43:04 2003
@@ -196,7 +196,7 @@
 #scrollblockLinker.transclusionPageSpanNodeType = None
 
 textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-_nodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 24)
+_nodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 1)
 nodeview = ff.swamp.CachedNodeFunction(50, fen.constgraph, _nodeview);
 view = ff.view.CanvasView2D(fen, nodeview)
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.5 
fenfire/org/fenfire/view/CanvasView2D.java:1.6
--- fenfire/org/fenfire/view/CanvasView2D.java:1.5      Fri Apr 25 09:57:07 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Fri Apr 25 10:43:04 2003
@@ -20,8 +20,8 @@
 /** A View2D on a PP-like canvas.
  */
 public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.5 2003/04/25 
13:57:07 benja Exp $";
-    public static boolean dbg = false;
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.6 2003/04/25 
14:43:04 tjl Exp $";
+    public static boolean dbg = true;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
     
     private Fen fen;
@@ -35,8 +35,9 @@
     public void render(VobScene vs, Object container,
                       int matchingParent, int box2screen, int box2plane)
     {
-       int paper2box = vs.coords.invert(box2plane);
-       int paper2screen = vs.coords.concat(box2screen, paper2box);
+       int paper2box = vs.invertCS(box2plane, "canvasview_INv");
+       int paper2screen = vs.concatCS(box2screen, "canvasview_conc",
+                       paper2box);
 
        Iterator iter = fen.constgraph.findN_11X_Iter(container, 
                                                      PP.contains);
@@ -50,9 +51,12 @@
            Placeable p = (Placeable)nodeView.f(fen.constgraph, n);
            
            Pair matchKey = new Pair(container, n);
-           int cs = vs.coords.translate(paper2screen, x, y);
-           //int cs = vs.coords.orthoBox(paper2screen, 0, x, y, 1, 1,
-           //p.getWidth(), p.getHeight());
+           // int cs = vs.coords.translate(paper2screen, x, y);
+           if(dbg) pa("CANVAS: "+p.getWidth()+" "+p.getHeight());
+
+           int cs = vs.coords.orthoBox(paper2screen, 0, 
+                               x, y, 1, 1,
+                           p.getWidth(), p.getHeight());
            vs.matcher.add(matchingParent, cs, matchKey);
            p.place(vs, cs);
        }
Index: fenfire/org/fenfire/view/IrregularViewportView2D.java
diff -u fenfire/org/fenfire/view/IrregularViewportView2D.java:1.4 
fenfire/org/fenfire/view/IrregularViewportView2D.java:1.5
--- fenfire/org/fenfire/view/IrregularViewportView2D.java:1.4   Fri Apr 25 
07:19:39 2003
+++ fenfire/org/fenfire/view/IrregularViewportView2D.java       Fri Apr 25 
10:43:04 2003
@@ -92,9 +92,9 @@
            }
        }
 
-       int paper2box = vs.invertCS(box2paper, "INVE");
+       int paper2box = vs.invertCS(box2paper, "IRREGU_INVE");
 
-       this.paper2screen = vs.concatCS(box2screen, "B2P", paper2box);
+       this.paper2screen = vs.concatCS(box2screen, "IRREGU_B2P", paper2box);
        this.box2screen = box2screen;
        this.box2paper = box2paper;
        this.vs = vs;
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.1 
fenfire/org/fenfire/view/TextNodeView.java:1.2
--- fenfire/org/fenfire/view/TextNodeView.java:1.1      Thu Apr 24 11:07:35 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Fri Apr 25 10:43:04 2003
@@ -59,10 +59,10 @@
        final float height = style.getHeight(scale);
 
        return new org.nongnu.libvob.lava.placeable.Placeable() {
-               public void place(VobScene scene, int into) {
-                   int scaled = scene.orthoCS(into, "Scaled", 0,
-                                              0, 0, scale, scale);
-                   scene.put(vob, scaled);
+               public void place(VobScene vs, int into) {
+                   int scaled = vs.orthoCS(into, "Scaled", 0,
+                                              0, 0, height, height);
+                   vs.put(vob, scaled);
                }
 
                public float getWidth() { return width; }
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.1 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.2
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.1   Fri Apr 25 09:57:08 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Fri Apr 25 10:43:04 2003
@@ -64,18 +64,21 @@
        Object plane = p.first;
        Rectangle rect = (Rectangle)p.second;
 
-       /**
        float[] tmp = new float[2];
        vs.coords.getSqSize(into, tmp);
        float w = tmp[0], h = tmp[1];
        pa("rect "+rect+" coords "+w+","+h);
-       **/
+
+       float scale = w / rect.width;
+       if(scale < h / rect.height) scale = h / rect.height;
 
        int box2paper = vs.coords.orthoBox(0, 0, rect.x, rect.y, 
-                                          1, 1, rect.width, rect.height);
+                                          scale, scale, 
+                                          w, h);
+       vs.matcher.add(into, box2paper, "BUOYPAP");
 
        view.render(vs, plane, into, into, box2paper);
-       return vs.coords.translate(into, rect.width/2f, rect.height/2f);
+       return vs.coords.translate(into, w/2f, h/2f);
     }
 
     public BuoyViewMainNode createMainNode(Object linkId,