[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/25 09:57:08

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: CanvasView2D.java 
        org/fenfire/view/buoy: MainNode2D.java 
Added files:
        org/fenfire/view/buoy: NodeType2D.java PPConnector.java 

Log message:
        Start buoys

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.23 
fenfire/org/fenfire/demo/buoyoing.py:1.24
--- fenfire/org/fenfire/demo/buoyoing.py:1.23   Fri Apr 25 08:49:29 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri Apr 25 09:57:07 2003
@@ -211,9 +211,11 @@
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
 # mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
+connector = ff.view.buoy.PPConnector(fen, irregu)
+
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
-       vob.buoy.buoymanager.RealBuoyManager.__init__(self, mainNode, [])
+       vob.buoy.buoymanager.RealBuoyManager.__init__(self, mainNode, 
[connector])
 
 currentScene = Scene()
 
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.4 
fenfire/org/fenfire/view/CanvasView2D.java:1.5
--- fenfire/org/fenfire/view/CanvasView2D.java:1.4      Fri Apr 25 09:01:49 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Fri Apr 25 09:57:07 2003
@@ -20,7 +20,7 @@
 /** A View2D on a PP-like canvas.
  */
 public class CanvasView2D extends View2D {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.4 2003/04/25 
13:01:49 tjl Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.5 2003/04/25 
13:57:07 benja Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
     
@@ -51,6 +51,8 @@
            
            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());
            vs.matcher.add(matchingParent, cs, matchKey);
            p.place(vs, cs);
        }
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.8 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.9
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.8   Fri Apr 25 09:54:58 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Fri Apr 25 09:57:07 2003
@@ -49,6 +49,8 @@
 
     private float tmp[] = new float[2];
 
+    public View2D getView() { return view; }
+
     /** Create a main node with a given plane, pan, and zoom.
      */
     public MainNode2D(Object plane, View2D view,