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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/28 07:46:49

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: PageSpanLayout.java PaperView2D.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 
                               AbstractNodeType2D.java MainNode2D.java 
                               NodeType2D.java NodeType2DFull.java 
                               PPConnector.java 
                               TransclusionConnector.java 

Log message:
        Buoys work with fisheye

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.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/AbstractNodeType2D.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/MainNode2D.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2DFull.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/PPConnector.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/TransclusionConnector.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.32 
fenfire/org/fenfire/demo/buoyoing.py:1.33
--- fenfire/org/fenfire/demo/buoyoing.py:1.32   Mon Apr 28 04:57:27 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Mon Apr 28 07:46:49 2003
@@ -150,7 +150,8 @@
 #connector = ff.view.buoy.PPConnector(fen, paperviewonly)
 #connector.hackForTesting = 1
 
-ppconnector = ff.view.buoy.PPConnector(fen, irregu)
+ppconnector = ff.view.buoy.PPConnector(fen, irregu, 
+                       ff.view.buoy.MainNode2D.MainNode2DFactory())
 tconnector = ff.view.buoy.TransclusionConnector(fen)
 
 #pagescroll2d = ff.view.IrregularViewportView2D(
@@ -158,8 +159,9 @@
 #                      ff.view.PageScrollView2D()))
 pagescroll2d = ff.view.PageScrollView2D()
 
-tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu)
-tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2DFull(pagescroll2d)
+tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu,
+                       ff.view.buoy.MainNode2D.MainNode2DFactory())
+tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2DFull(pagescroll2d, 
ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory())
 
 print "DUMPING ENFOVERLAP!"
 em = fen.enfiladeOverlap.getContents()
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.7 
fenfire/org/fenfire/view/PageSpanLayout.java:1.8
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.7    Sun Apr 27 16:19:25 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Mon Apr 28 07:46:49 2003
@@ -21,7 +21,7 @@
 
     public static final float scale = 72 * 6;
 
-    public static float diceLength = 20f;
+    public static float diceLength = 10f;
     public static int diceDepth = 20;
     public static int  flags = 2;
 
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.6 
fenfire/org/fenfire/view/PaperView2D.java:1.7
--- fenfire/org/fenfire/view/PaperView2D.java:1.6       Sun Apr 27 07:40:27 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Mon Apr 28 07:46:49 2003
@@ -13,7 +13,7 @@
  */
 public class PaperView2D extends View2D {
     public static boolean dbg = true;
-public static final String rcsid = "$Id: PaperView2D.java,v 1.6 2003/04/27 
11:40:27 tjl Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.7 2003/04/28 
11:46:49 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
 
     public PaperMill paperMill;
@@ -37,6 +37,7 @@
 
     private float[] tmp = new float[2];
     private float[] tmp2 = new float[2];
+
     public void render(VobScene vs, 
                Object plane,
                int matchingParent,
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.1 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.2
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.1   Mon Apr 28 
04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Mon Apr 28 
07:46:49 2003
@@ -23,6 +23,10 @@
 
     protected float panX, panY;
 
+    public interface Factory {
+       AbstractMainNode2D create(Object plane, View2D view2d,
+                   float panx, float pany);
+    }
 
 
     /** The box2screen coordinate system we set last.
Index: fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.1 
fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.2
--- fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.1   Mon Apr 28 
04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java       Mon Apr 28 
07:46:49 2003
@@ -13,11 +13,14 @@
 
 public abstract class AbstractNodeType2D implements BuoyViewNodeType {
     protected View2D view2d;
+    protected AbstractMainNode2D.Factory mainNodeFactory;
 
     public View2D getView2D() { return view2d; }
 
-    public AbstractNodeType2D(View2D view2d) {
+    public AbstractNodeType2D(View2D view2d, 
+               AbstractMainNode2D.Factory factory) {
        this.view2d = view2d;
+       this.mainNodeFactory = factory;
     }
 
     public BuoyViewMainNode createMainNode(Object linkId, 
@@ -26,8 +29,8 @@
        Object plane = p.first;
        Rectangle rect = (Rectangle)p.second;
 
-       return new MainNode2D(plane, view2d,
+       return mainNodeFactory.create(plane, view2d,
                              rect.x+rect.width/2f,
-                             rect.y+rect.height/2f, 1);
+                             rect.y+rect.height/2f);
     }
 }
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.12 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.13
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.12  Mon Apr 28 04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Mon Apr 28 07:46:49 2003
@@ -45,6 +45,14 @@
 
     private float tmp[] = new float[2];
 
+    static public class MainNode2DFactory implements Factory {
+       public float zoom;
+       public AbstractMainNode2D create(Object plane, View2D view2d,
+                   float panx, float pany) {
+           return new MainNode2D(plane, view2d, panx, pany, zoom);
+       }
+    }
+
     /** Create a main node with a given plane, pan, and zoom.
      */
     public MainNode2D(Object plane, View2D view2d,
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.6 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.7
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.6   Mon Apr 28 04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Mon Apr 28 07:46:49 2003
@@ -45,8 +45,8 @@
     public static int effigy = 0;
     
 
-    public NodeType2D(View2D view2d) {
-       super(view2d);
+    public NodeType2D(View2D view2d, AbstractMainNode2D.Factory factory) {
+       super(view2d, factory);
     }
     
     public Object getSize(Object linkId, Object anchor,
Index: fenfire/org/fenfire/view/buoy/NodeType2DFull.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.1 
fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.2
--- fenfire/org/fenfire/view/buoy/NodeType2DFull.java:1.1       Mon Apr 28 
04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2DFull.java   Mon Apr 28 07:46:49 2003
@@ -20,8 +20,8 @@
 
     public static int effigy = 0;
 
-    public NodeType2DFull(View2D view2d) {
-       super(view2d);
+    public NodeType2DFull(View2D view2d, AbstractMainNode2D.Factory factory) {
+       super(view2d, factory);
     }
 
     public Object getSize(Object linkId, Object anchor,
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.4 
fenfire/org/fenfire/view/buoy/PPConnector.java:1.5
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.4  Mon Apr 28 04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java      Mon Apr 28 07:46:49 2003
@@ -16,7 +16,7 @@
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.4 2003/04/28 
08:57:27 tjl Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.5 2003/04/28 
11:46:49 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }
 
@@ -25,10 +25,11 @@
     private Fen fen;
     private View2D view2d;
     private BuoyViewNodeType nodeType;
-    public PPConnector(Fen fen, View2D view2d) {
+    public PPConnector(Fen fen, View2D view2d, 
+               AbstractMainNode2D.Factory factory) {
        this.fen = fen;
        this.view2d = view2d;
-       this.nodeType = new NodeType2D(view2d);
+       this.nodeType = new NodeType2D(view2d, factory);
     }
 
     public void addBuoys(VobScene vs, int parentCs,
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.4 
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.5
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.4        Mon Apr 
28 04:57:27 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java    Mon Apr 28 
07:46:49 2003
@@ -20,7 +20,7 @@
 /** Hang transclusion buoys.
  */
 public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.4 
2003/04/28 08:57:27 tjl Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.5 
2003/04/28 11:46:49 tjl Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }
 
@@ -57,10 +57,12 @@
     public void addBuoys(VobScene vs, int parentCs,
                         BuoyViewMainNode mainNode,
                         BuoyLinkListener l) {
-       if(!(mainNode instanceof MainNode2D)) return;
-       MainNode2D mn2d = (MainNode2D)mainNode;
+       if(!(mainNode instanceof AbstractMainNode2D)) return;
+       AbstractMainNode2D mn2d = (AbstractMainNode2D)mainNode;
        DefaultVobMatcher m = (DefaultVobMatcher)vs.matcher;
+       if(dbg) pa("Trying transclusion addbuoys");
        if(mn2d.getView2D() == normalNodeNodeType.getView2D()) {
+           pa("TransclusionConnector: canvas -> scrolls");
            // Loop over the placed nodes' keys
            for(Iterator i=m.getKeys(parentCs).iterator(); i.hasNext();) {
                Object key = i.next();