[Gzz-commits] fenfire/org/fenfire/view AreaSelectingView2D.ja...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/03 10:02:29

Modified files:
        org/fenfire/view: AreaSelectingView2D.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 
        org/fenfire/view/lava: FastView.java 

Log message:
        fixes: selection, FastView doc and implementation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/AreaSelectingView2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/FastView.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/AreaSelectingView2D.java
diff -u fenfire/org/fenfire/view/AreaSelectingView2D.java:1.6 
fenfire/org/fenfire/view/AreaSelectingView2D.java:1.7
--- fenfire/org/fenfire/view/AreaSelectingView2D.java:1.6       Tue Jul  1 
12:33:33 2003
+++ fenfire/org/fenfire/view/AreaSelectingView2D.java   Thu Jul  3 10:02:28 2003
@@ -26,6 +26,10 @@
     private Paper paper;
     private GLRen.FixedPaperQuad pq;
 
+    public boolean hasSelection() {
+       return x0!=0 || y0!=0 || x1!=0 || y1!=0;
+    }
+
     public AreaSelectingView2D(View2D child) {
         this(child, null);
     }
@@ -50,7 +54,7 @@
        int paper2box = vs.invertCS(box2paper, "areaselectview_INv");
        int paper2screen = vs.concatCS(box2screen, "areaselectview_conc",
                                    paper2box);
-       int cs = vs.orthoCS(paper2screen, "selection", 0, x0,y0,x1,y1);
+       int cs = vs.orthoCS(paper2screen, "selection", 0, x0,y0,x1-x0,y1-y0);
         vs.put(pq, cs);
 
     }
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.29 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.30
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.29  Tue Jul  1 
12:33:33 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Thu Jul  3 
10:02:28 2003
@@ -265,10 +265,11 @@
         setZoomPan(oldVobScene, box2screen);
 
        View2D view = getView2D();
-       while (view.getChildView2D() != null) 
+       while (view != null) {
+           if (view instanceof FastView)
+               ((FastView)view).chgFast(oldVobScene);
            view = view.getChildView2D();
-        if (view instanceof FastView)
-            ((FastView)view).chgFast(oldVobScene);
+       }
     }
 
     public Object getNodeOnPlane(VobScene oldVobScene, float x, float y) {
Index: fenfire/org/fenfire/view/lava/FastView.java
diff -u fenfire/org/fenfire/view/lava/FastView.java:1.1 
fenfire/org/fenfire/view/lava/FastView.java:1.2
--- fenfire/org/fenfire/view/lava/FastView.java:1.1     Tue Jun 24 09:52:14 2003
+++ fenfire/org/fenfire/view/lava/FastView.java Thu Jul  3 10:02:28 2003
@@ -3,10 +3,22 @@
 package org.fenfire.view.lava;
 import org.nongnu.libvob.VobScene;
 
-/** Interface for fast views.
- * Changes VobScene by really not changing it.
+/** An interface for a view which change is done through setOrthoParams.
+ * If animation/interpolation is not needed and changing of 
+ * scene must be fast, the libvob platform provides a technique 
+ * to not regenerate but change parameters of VobScene.coords.
+ * 
+ * @see VobCoorder
  * @see VobScene setOrthoBoxParams
  */
 public interface FastView {
+
+    /* Method to give the old scene to view.
+     * @param oldVobScene is the VobScene which is used in previous 
+     *        scene. The view must not try to rerender into this scene
+     *        but use parametrisation of old coordinate system through 
+     *        setOrthoParams.
+     * @see VobCoorder
+     */ 
     void chgFast(VobScene oldVobScene);
 }