[Gzz-commits] fenfire/org/fenfire/view IrregularViewportView2...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/05/13 15:52:08

Modified files:
        org/fenfire/view: IrregularViewportView2D.java PaperView2D.java 
                          View2D.java papercanvas2d.test 
        org/fenfire/view/buoy: AbstractMainNode2D.java MainNode2D.java 

Log message:
        now 3button click finds the node

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/IrregularViewportView2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/View2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/IrregularViewportView2D.java
diff -u fenfire/org/fenfire/view/IrregularViewportView2D.java:1.6 
fenfire/org/fenfire/view/IrregularViewportView2D.java:1.7
--- fenfire/org/fenfire/view/IrregularViewportView2D.java:1.6   Sun Apr 27 
15:33:22 2003
+++ fenfire/org/fenfire/view/IrregularViewportView2D.java       Tue May 13 
15:52:08 2003
@@ -24,6 +24,7 @@
      */
     public int debugFlags = 0;
 
+    public View2D getChildView2D() { return child; }
     public View2D child;
 
     public IrregularViewportView2D(View2D child) {
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.11 
fenfire/org/fenfire/view/PaperView2D.java:1.12
--- fenfire/org/fenfire/view/PaperView2D.java:1.11      Thu May  8 09:38:57 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Tue May 13 15:52:08 2003
@@ -12,7 +12,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.11 2003/05/08 
13:38:57 tjl Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.12 2003/05/13 
19:52:08 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PaperView2D::"+s); }
 
@@ -22,6 +22,7 @@
 
     public float paperScaling = 1/200f;
 
+    public View2D getChildView2D() { return child; }
     protected View2D child;
     
     public PaperView2D(GraphicsAPI.RenderingSurface optWin) { 
Index: fenfire/org/fenfire/view/View2D.java
diff -u fenfire/org/fenfire/view/View2D.java:1.4 
fenfire/org/fenfire/view/View2D.java:1.5
--- fenfire/org/fenfire/view/View2D.java:1.4    Thu Apr 24 14:21:00 2003
+++ fenfire/org/fenfire/view/View2D.java        Tue May 13 15:52:08 2003
@@ -65,4 +65,10 @@
        wh[0] = -1;
        wh[1] = -1;
     }
+
+    /** Get the child View2D of this view if any.
+     * @return null if none.
+     */
+    public View2D getChildView2D() { return null; }
+
 }
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.5 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.6
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.5   Sun May  4 
21:38:50 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Tue May 13 
15:52:08 2003
@@ -1,6 +1,7 @@
 // (c) Benja Fallenstein and Matti Katila and Tuomas J. Lukka
 
 package org.fenfire.view.buoy;
+import org.fenfire.view.*;
 
 import org.fenfire.view.View2D;
 import org.nongnu.libvob.*;
@@ -14,7 +15,7 @@
  */
 public abstract class AbstractMainNode2D implements BuoyViewMainNode {
     public static boolean dbg = true;
-    private static void pa(String s) { 
System.out.println("AbstractMainNode2D:: "+s); }
+    private static void p(String s) { System.out.println("AbstractMainNode2D:: 
"+s); }
 
     protected Object plane;
     protected View2D view2d;
@@ -80,12 +81,12 @@
     protected void mouseMoveClick(int x, int y, VobScene oldVobScene) {
        float[] pt = new float[] { x, y, 0 };
 
-       if(dbg) pa("P1: "+pt[0]+" "+pt[1]+" "+pt[2]);
+       if(dbg) p("P1: "+pt[0]+" "+pt[1]+" "+pt[2]);
        oldVobScene.coords.inverseTransformPoints3(
                box2screen, pt, pt);
-       if(dbg) pa("P2: "+pt[0]+" "+pt[1]+" "+pt[2]);
+       if(dbg) p("P2: "+pt[0]+" "+pt[1]+" "+pt[2]);
        oldVobScene.coords.transformPoints3(box2paper, pt, pt);
-       if(dbg) pa("P3: "+pt[0]+" "+pt[1]+" "+pt[2]);
+       if(dbg) p("P3: "+pt[0]+" "+pt[1]+" "+pt[2]);
 
        panX = pt[0]; panY = pt[1];
        clipPan();
@@ -142,7 +143,31 @@
            return false;
        }
 
-       if(dbg) pa("nothing!");
+       // See around of objects
+       if(m_state[2] == e.BUTTON3_MASK &&
+          e.getID() == MouseEvent.MOUSE_CLICKED){
+
+           View2D view = getView2D();
+           p("v1: "+view);
+           while (view.getChildView2D() != null) 
+               view = view.getChildView2D();
+           p("v2: "+view);
+
+           if (view instanceof CanvasView2D) {
+           
+               Object obj = ((CanvasView2D)view).getNode(oldVobScene, 
e.getX(), e.getY(), 
+                                                plane, box2screen, box2screen,
+                                                box2paper, null);
+               
+               p("Object is: "+ obj.toString() + " TADAA!!");
+           }
+           else p("not a canvas view?");
+
+           return false;
+       }
+
+
+       if(dbg) p("nothing!");
        return false;
     }
 
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.19 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.20
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.19  Thu May  8 13:30:19 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Tue May 13 15:52:08 2003
@@ -104,7 +104,8 @@
 
     public boolean doMouse(MouseEvent e, VobScene oldVobScene) {
        // let's zoom!!
-       if (m_state[2] == e.BUTTON3_MASK) {
+       if (m_state[2] == e.BUTTON3_MASK &&
+           e.getID() == MouseEvent.MOUSE_DRAGGED) {
            zoom = m_state_zoom * (float) 
                Math.exp((m_state[1] - e.getY())/150.0);
            AbstractUpdateManager.setNoAnimation();
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.7 
fenfire/org/fenfire/view/papercanvas2d.test:1.8
--- fenfire/org/fenfire/view/papercanvas2d.test:1.7     Tue May 13 07:48:32 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Tue May 13 15:52:08 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 import java
 import vob