[Gzz-commits] fenfire/org/fenfire/view/buoy AbstractMainNode2...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/06/22 12:15:35

Modified files:
        org/fenfire/view/buoy: AbstractMainNode2D.java 
                               FisheyeMainNode2D.java MainNode2D.java 

Log message:
        added methods to change focus without mouse events

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.21 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.22
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.21  Thu Jun 19 
07:57:47 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Sun Jun 22 
12:15:35 2003
@@ -273,6 +273,9 @@
         setZoomPan(oldVobScene, box2screen);
     }
 
+    public abstract void changeZoom(float change);
+    public void changeSize(float change) { ;}
+
     protected boolean doMouse(MouseEvent e, VobScene oldVobScene) {
        // Move by dragging with button 1
        if(m_state[2] == e.BUTTON1_MASK && 
Index: fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.8 
fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.9
--- fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java:1.8    Thu Jun 19 
07:57:47 2003
+++ fenfire/org/fenfire/view/buoy/FisheyeMainNode2D.java        Sun Jun 22 
12:15:35 2003
@@ -60,6 +60,12 @@
         focus.setZoom(1);
     }
 
+    public void changeZoom(float change) {
+       fisheyeState.changeMagnitude(change);
+    }
+    public void changeSize(float change) {
+       fisheyeState.changeSize(change); 
+    }
 
     protected void setZoomPan(VobScene vs, int mainFrame) {
        vs.coords.setTranslateParams(box2paper, 
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.25 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.26
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.25  Thu Jun 19 07:57:47 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Sun Jun 22 12:15:35 2003
@@ -104,6 +104,11 @@
        m_state_zoom = zoom;
     }
 
+    public void changeZoom(float change) {
+       zoom = focus.getZoom() * (float) Math.exp(change/150.0);
+       focus.setZoom(zoom);
+    }
+
     public boolean doMouse(MouseEvent e, VobScene oldVobScene) {
        // let's zoom!!
        if (m_state[2] == e.BUTTON2_MASK &&