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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/23 08:25:52

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

Log message:
        remove basalt

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.23 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.24
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.23  Sun Jun 22 
14:18:14 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Mon Jun 23 
08:25:52 2003
@@ -234,38 +234,9 @@
     }
 
 
-    // Mouse press state
-    // x, y, buttons
-    protected int[] m_state = null;
-    protected float pan[] = new float[2];
-
-    // Mouse x/y position on the paper
-    protected float m_pos[] = new float[3];
-
-    protected void readMouseState(MouseEvent e, VobScene oldVobScene) {
-       m_state = new int[]{ e.getX(), e.getY(), e.getModifiers()};
-       pan[0] = focus.getPanX(); pan[1] = focus.getPanY();
-       m_pos[0] = m_state[0]; m_pos[1] = m_state[1]; m_pos[2] = 0;
-       oldVobScene.coords.inverseTransformPoints3(box2screen, m_pos, m_pos);
-    }
-
-
-    private GraphicsAPI.Window win = null;
-    public boolean mouse(MouseEvent e, VobScene oldVobScene, 
-                         GraphicsAPI.Window w) {
-        win = w;
-        return mouse(e, oldVobScene);
-    }
-
     public boolean mouse(MouseEvent e, VobScene oldVobScene) {
-        // win.setCursor("default");
-       if (e.getID() == MouseEvent.MOUSE_PRESSED) {
-           readMouseState(e, oldVobScene);
-           return false;
-       }
-
-       if (m_state == null) throw new Error("Mouse state not found!");
-       return doMouse(e, oldVobScene);
+       //return controller.mouse(e, oldVobScene);
+       return false;
     }
 
     public void chgFast(VobScene oldVobScene) {
@@ -273,44 +244,6 @@
         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 && 
-          e.getID() == MouseEvent.MOUSE_DRAGGED) {
-            win.setCursor("move");
-
-           float[] pos2 = new float[] { e.getX(), e.getY(), 0 };
-           oldVobScene.coords.inverseTransformPoints3(box2screen, pos2, pos2);
-
-           focus.setPan(pan[0] + (m_pos[0] - pos2[0])/getZoom(),
-                        pan[1] + (m_pos[1] - pos2[1])/getZoom());
-           clipPan();
-
-           setZoomPan(oldVobScene, box2screen);
-           return true;
-       }
-       
-       // Move around by clicking
-       if(m_state[2] == e.BUTTON1_MASK && 
-          e.getID() == MouseEvent.MOUSE_CLICKED){
-           mouseMoveClick(e.getX(), e.getY(), oldVobScene);
-           return false;
-       }
-
-       // See around of objects
-       if(m_state[2] == e.BUTTON2_MASK &&
-          e.getID() == MouseEvent.MOUSE_CLICKED){
-           getNodeOnPlane(oldVobScene, e.getX(), e.getY());
-           return false;
-       }
-
-       if(dbg) p("nothing!");
-       return false;
-    }
-
     public Object getNodeOnPlane(VobScene oldVobScene, float x, float y) {
        View2D view = getView2D();
        while (view.getChildView2D() != null) 
@@ -328,10 +261,4 @@
        } else p("not a canvas view?");
        return null;
     }
-
-
-    /** DEPRECATED 
-     * @see Focus
-     */
-    protected float getZoom() { return 1; }
 }
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.26 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.27
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.26  Sun Jun 22 12:15:35 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Mon Jun 23 08:25:52 2003
@@ -1,5 +1,5 @@
 /*
-PageScrollView2D.java
+MainNode2D.java
  *    
  *    Copyright (c) 2003 by Benja Fallenstein and Matti Katila
  *    
@@ -31,11 +31,8 @@
 import org.nongnu.libvob.impl.DefaultVobMatcher;
 import org.nongnu.libvob.buoy.*;
 
-import java.awt.event.MouseEvent;
-
 /** A BuoyViewMainNode showing a 2D plane rendered through
- *  a View2D. This class implements the keyboard and mouse
- *  command for moving on the spatial plane.
+ *  a View2D.
  */
 public class MainNode2D extends AbstractMainNode2D {
     public static boolean dbg = true;
@@ -95,33 +92,4 @@
                        focus.getPanX()-boxw/zoom/2, 
focus.getPanY()-boxh/zoom/2, 
                                    1/zoom, 1/zoom, boxw, boxh);
     }
-
-
-    private float m_state_zoom = -1;
-
-    protected void readMouseState(MouseEvent e, VobScene oldVobScene) {
-       super.readMouseState(e, oldVobScene);
-       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 &&
-           e.getID() == MouseEvent.MOUSE_DRAGGED) {
-           zoom = m_state_zoom * (float) 
-               Math.exp((m_state[1] - e.getY())/150.0);
-           AbstractUpdateManager.setNoAnimation();
-           setZoomPan(oldVobScene, box2screen);
-           return true;
-       }
-
-       return super.doMouse(e, oldVobScene);
-    }
-
-    protected float getZoom() { return zoom; }
 }