[Gzz-commits] gzz/gzz/modules/pp PPView2.java

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/12/06 15:51:29

Modified files:
        gzz/modules/pp : PPView2.java 

Log message:
        added nadir. some fixes for paper deleting. broke animateing!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.24 
gzz/gzz/modules/pp/PPView2.java:1.25
--- gzz/gzz/modules/pp/PPView2.java:1.24        Fri Dec  6 07:20:16 2002
+++ gzz/gzz/modules/pp/PPView2.java     Fri Dec  6 15:51:29 2002
@@ -267,16 +267,35 @@
            final int anchorUnit = vs.unitSqCS(anchor, "AUSQ"); 
            int actr = vs.translateCS(anchorUnit, "TR12", .5f, .5f);
            int buoycs = floater.buoyCoordsys(actr, key);
+  /*  BEGIN FROM HERE */
+           //vs.matcher.add(buoycs, "buoycs");
 
-           final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
+           // Nadir CS
+           int nadir_point_cs = vs.orthoBoxCS(0, "nadir_frame", 0, 
+                                              leftPanelRealWidth + 
0.5f*mainWidth,
+                                              mainHeight*1.5f,
+                                              1, 1, 2, 2);
+           final int nadir = ((GLVobCoorder)vs.coords).nadirOrigin(buoycs, 
nadir_point_cs);
+           vs.matcher.add(nadir, "nadir_frameCS");
+
+   /* only one paper will be animated! */
+   /* if you enable this nothing animates */
+           //vs.matcher.add(buoycs, nadir,"B2N");
+
+           //final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
+           final int frameCS = vs.orthoBoxCS(nadir, "frame", 0, 
                    -buoyVPWidth/2, -buoyVPHeight/2, 1, 1, 
                    buoyVPWidth, buoyVPHeight);
            vs.activate(frameCS);
+
+
            // XXX Pan
            int[] pan = getCoords(c);
            final int c2fCS = vs.coords.ortho(0, 0, 
                    -pan[0]*buoyZoom, -pan[1]*buoyZoom, buoyZoom, buoyZoom);
-           vs.matcher.add(buoycs, c2fCS, "C2F");
+           //vs.matcher.add(buoycs, c2fCS, "C2F");
+           vs.matcher.add(nadir, c2fCS, "C2F");
+ /*  END TO HERE */
 
            buoyqueue.add(new Runnable() {
                public void run() {
@@ -600,7 +619,10 @@
                } else if 
("delete_paper_button_frame".equals(vs.matcher.getKey(cs)) ) {
                    pa("Deleting paper!");
                    Cell c = ((AbstractViewContext)context).getAccursed();
-                   ppactions.deletePaper(c.getId() );
+                   if (space.getHomeCell() != c) {
+                       ppactions.deletePaper(c.getId() );
+                       
((AbstractViewContext)context).setAccursed(space.getHomeCell());
+                   }
                } else {
                    pa("WRONG KEY! "+vs.matcher.getKey(cs));
                }
@@ -610,6 +632,9 @@
 
        // Get its parent
        int vp = ((GLVobCoorder)vs.coords).getParent(cs);
+       if ("Nadir".equals(((GLVobCoorder)vs.coords).getCoordSystemStr(vp))) {
+           vp = ((GLVobCoorder)vs.coords).getParent(vp);
+       }
        Object key = vs.matcher.getKey(vp);
 
        pa("pushed key: "+ key +" parent vp: " +vp);