[ff-cvs] fenfire/org/fenfire fenpdf/appearance/views.py ...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/25 05:59:11

Modified files:
        org/fenfire/fenpdf/appearance: views.py 
        org/fenfire/view: PaperView2D.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 

Log message:
        Take along foci

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.12 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.13
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.12 Mon Aug 25 05:43:29 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Mon Aug 25 05:59:10 2003
@@ -96,8 +96,23 @@
        self.geometryConfiguration = \
            ff.fenpdf.appearance.fenpdfgeometry.FenPDFGeometryConfiguration()
 
-       mainNode = self.createMainNode(self.home)
-       mainNode2 = self.createMainNode(self.home)
+       if self.buoyManager:
+           # Updating - put the foci back
+           # XXX Encaps buoyManager
+           old = self.buoyManager.singles[0].mainNode
+           old2 = self.buoyManager.singles[1].mainNode
+           mainNode = self.createMainNode(old.getPlane())
+           mainNode2 = self.createMainNode(old2.getPlane())
+           print "FOCI: ",old.getFocus(), old2.getFocus(), \
+                           mainNode.getFocus(), mainNode2.getFocus()
+           mainNode.setFocus(old.getFocus())
+           mainNode2.setFocus(old2.getFocus())
+           print "FOCI: ",old.getFocus(), old2.getFocus(), \
+                           mainNode.getFocus(), mainNode2.getFocus()
+       else:
+           # Start fresh from home
+           mainNode = self.createMainNode(self.home)
+           mainNode2 = self.createMainNode(self.home)
 
        self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
            [mainNode, mainNode2], self.connectors, self.eventHandler,
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.19 
fenfire/org/fenfire/view/PaperView2D.java:1.20
--- fenfire/org/fenfire/view/PaperView2D.java:1.19      Mon Aug 25 05:28:53 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Mon Aug 25 05:59:11 2003
@@ -36,7 +36,7 @@
  * this other view is rendered on top of the paper.
  */
 public class PaperView2D extends View2D {
-public static final String rcsid = "$Id: PaperView2D.java,v 1.19 2003/08/25 
09:28:53 tjl Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.20 2003/08/25 
09:59:11 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PaperView2D::"+s); }
 
@@ -44,7 +44,7 @@
     public float dicefactor = 1;
     public int flags = 0;
 
-    public float paperScaling = .5; // 1/200f;
+    public float paperScaling = .5f; 
 
     public View2D getChildView2D() { return child; }
     protected View2D child;
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.47 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.48
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.47  Sat Aug 23 
13:13:33 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Mon Aug 25 
05:59:11 2003
@@ -83,6 +83,9 @@
            this.panX = panX;
            this.panY = panY;
        }
+       public String toString() {
+           return "[SimpleFocus: "+panX+" "+panY+" "+zoom+"]";
+       }
     }
 
     /** The view shown in this buoy node.
@@ -92,7 +95,7 @@
 
     protected Focus focus;
     public Focus getFocus() { return focus; }
-    public void setFocus(Focus f) { this.focus = focus; }
+    public void setFocus(Focus focus) { this.focus = focus; }
 
     public interface Factory {
        AbstractMainNode2D create(Object plane, View2D view2d,