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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/24 16:10:03

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: CanvasView2D.java 

Log message:
        Start using buoyoing with new system. No background and irreguframe 
yet...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.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.17 
fenfire/org/fenfire/demo/buoyoing.py:1.18
--- fenfire/org/fenfire/demo/buoyoing.py:1.17   Thu Apr 24 15:08:57 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Apr 24 16:10:02 2003
@@ -197,10 +197,11 @@
 # For now, no transclusions there
 #scrollblockLinker.transclusionPageSpanNodeType = None
 
-#mainNodeType = (scrollblockLinker.xulinkPageSpanNodeType, None, pagespans[0])
-# mainNodeType = (adaptor.nodes[0], None, ff.swamp.Nodes.get(paper))
-node = ff.swamp.Nodes.get(note1)
-mainNode = nodeBuoyViewNodeType.createMainNode(node, None, None)
+textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
+nodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 24)
+view = ff.view.CanvasView2D(fen, nodeview)
+plane = ff.swamp.Nodes.get(paperA)
+mainNode = ff.view.buoy.MainNode2D(plane, view)
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.1 
fenfire/org/fenfire/view/CanvasView2D.java:1.2
--- fenfire/org/fenfire/view/CanvasView2D.java:1.1      Thu Apr 24 15:55:36 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Thu Apr 24 16:10:03 2003
@@ -19,21 +19,17 @@
 
 /** A View2D on a PP-like canvas.
  */
-public class CanvasView2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.1 2003/04/24 
19:55:36 benja Exp $";
+public class CanvasView2D extends View2D {
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.2 2003/04/24 
20:10:03 benja Exp $";
     public static boolean dbg = false;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
     
     private Fen fen;
-    private Object cType;
-    private Object cont;
     private NodeFunction nodeView;
 
-    public CanvasView2D(Fen fen, Object containment,
-                       NodeFunction nodeView) {
+    public CanvasView2D(Fen fen, NodeFunction nodeView) {
        this.fen = fen;
-       cont = containment;
        this.nodeView = nodeView;
     }
 
@@ -43,7 +39,8 @@
        int paper2box = vs.coords.invert(box2plane);
        int paper2screen = vs.coords.concat(paper2box, box2screen);
 
-       Iterator iter = fen.constgraph.findN_11X_Iter(container, cont);
+       Iterator iter = fen.constgraph.findN_11X_Iter(container, 
+                                                     PP.contains);
        while (iter.hasNext()) {
            Object n = iter.next();