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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/05/03 06:04:48

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

Log message:
        Fix buoy-to-main interpolation by setting zoom.
        Everybody: When an object needs a parameter,
        *make the constructor set it*. It is *very bad
        style* to make a public instance variable
        and have it set from the outside. Besides,
        it gives you this kind of bug.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.37 
fenfire/org/fenfire/demo/buoyoing.py:1.38
--- fenfire/org/fenfire/demo/buoyoing.py:1.37   Fri May  2 20:56:59 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sat May  3 06:04:48 2003
@@ -137,7 +137,7 @@
 #connector.hackForTesting = 1
 
 ppconnector = ff.view.buoy.PPConnector(fen, irregu, 
-                       ff.view.buoy.MainNode2D.MainNode2DFactory())
+                       ff.view.buoy.MainNode2D.MainNode2DFactory(1))
 tconnector = ff.view.buoy.TransclusionConnector(fen)
 
 #pagescroll2d = ff.view.IrregularViewportView2D(
@@ -146,7 +146,7 @@
 pagescroll2d = ff.view.PageScrollView2D()
 
 tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu,
-                       ff.view.buoy.MainNode2D.MainNode2DFactory())
+                       ff.view.buoy.MainNode2D.MainNode2DFactory(1))
 tconnector.pageImageScrollNodeType = ff.view.buoy.NodeType2DFull(pagescroll2d, 
ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory())
 
 print "DUMPING ENFOVERLAP!"
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.14 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.15
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.14  Fri May  2 20:57:00 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Sat May  3 06:04:48 2003
@@ -47,6 +47,9 @@
 
     static public class MainNode2DFactory implements Factory {
        public float zoom;
+       public MainNode2DFactory(float zoom) {
+           this.zoom = zoom;
+       }
        public AbstractMainNode2D create(Object plane, View2D view2d,
                    float panx, float pany) {
            return new MainNode2D(plane, view2d, panx, pany, zoom);