[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/view/FisheyeState....

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/12 07:47:07

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/view       : FisheyeState.java PageSpanCellView.java 
        gzz/view/buoy  : buoymanager.py 

Log message:
        Speed up zooming by a 'little'

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FisheyeState.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.19 gzz/gfx/demo/buoyoing.py:1.20
--- gzz/gfx/demo/buoyoing.py:1.19       Wed Feb 12 06:04:07 2003
+++ gzz/gfx/demo/buoyoing.py    Wed Feb 12 07:47:06 2003
@@ -18,6 +18,8 @@
 from gzz.modules.pp2 import PPCanvasNode
 from gzz.view.buoy import PPLinker
 
+gzz.view.PageSpanCellView.dicefactor = .01
+
 buoymanager.replaceNewScene = replaceNewScene
 
 gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
Index: gzz/gzz/view/FisheyeState.java
diff -u gzz/gzz/view/FisheyeState.java:1.1 gzz/gzz/view/FisheyeState.java:1.2
--- gzz/gzz/view/FisheyeState.java:1.1  Wed Feb 12 05:13:03 2003
+++ gzz/gzz/view/FisheyeState.java      Wed Feb 12 07:47:06 2003
@@ -10,7 +10,7 @@
  * Uses clicks and drags by mouse button 3.
  */
 public class FisheyeState {
-public static final String rcsid = "$Id: FisheyeState.java,v 1.1 2003/02/12 
10:13:03 tjl Exp $";
+public static final String rcsid = "$Id: FisheyeState.java,v 1.2 2003/02/12 
12:47:06 tjl Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -62,7 +62,7 @@
        return cs2;
     }
     public void setCoordsysParams() {
-       pa("Fisheyestate: " +
+       if(dbg) pa("Fisheyestate: " +
                    cursize + " " +
                    curx + " " +
                    cury + " " +
@@ -77,7 +77,7 @@
     }
 
     public boolean event(java.awt.event.MouseEvent e) {
-       pa("Ev:"+e);
+       if(dbg) pa("Ev:"+e);
        if(e.getID() == e.MOUSE_PRESSED) {
            if(e.getModifiers() != e.BUTTON3_MASK) return false;
            curMouseX = e.getX();
@@ -91,8 +91,8 @@
            curMouseX = e.getX();
            curMouseY = e.getY();
 
-           curmag *= Math.exp(.01 * dy);
-           cursize *= Math.exp(.01 * dx);
+           curmag *= Math.exp(.005 * dy);
+           cursize *= Math.exp(.005 * dx);
 
            if(curmag < minmag) curmag = minmag;
            if(curmag > maxmag) curmag = maxmag;
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.20 
gzz/gzz/view/PageSpanCellView.java:1.21
--- gzz/gzz/view/PageSpanCellView.java:1.20     Wed Feb 12 05:15:14 2003
+++ gzz/gzz/view/PageSpanCellView.java  Wed Feb 12 07:47:06 2003
@@ -21,7 +21,8 @@
     private static void pa(String s) { System.out.println(s); }
 
     public static final float scale = 72 * 6;
-    public static final float dicefactor = .5f;
+
+    public static float dicefactor = .5f;
 
     public boolean useBg = true;
 
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.25 
gzz/gzz/view/buoy/buoymanager.py:1.26
--- gzz/gzz/view/buoy/buoymanager.py:1.25       Wed Feb 12 05:57:44 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Wed Feb 12 07:47:06 2003
@@ -145,10 +145,10 @@
        x, y = ev.getX(), ev.getY()
        cs = self.vs.getCSAt(0, x, y, None)
        link = self.cs.get(cs, None)
-       print "IN CS: ",cs, link
+       # print "IN CS: ",cs, link
        if link == None:
            if self.mainNode.mouse(ev, self.vs):
-               #replaceNewScene(self.vs) # XXX
+               replaceNewScene(self.vs)
                gzz.client.AbstractUpdateManager.setNoAnimation()
                gzz.client.AbstractUpdateManager.chg()
        else: