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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/11/04 03:45:59

Modified files:
        .              : TODO 
        gzz/modules/pp : PPView2.java demotest.py 

Log message:
        Keys for vobs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.359&tr2=1.360&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.359 gzz/TODO:1.360
--- gzz/TODO:1.359      Mon Nov  4 02:53:14 2002
+++ gzz/TODO    Mon Nov  4 03:45:58 2002
@@ -103,7 +103,6 @@
        - PP [deadline 5.11]
            - refactor
                - implement using the new gzz.view classes
-                   - buoys
                    - buoy pan
                    - hopping to buoy - keying, animation
            - make it work again
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.7 gzz/gzz/modules/pp/PPView2.java:1.8
--- gzz/gzz/modules/pp/PPView2.java:1.7 Mon Nov  4 02:53:15 2002
+++ gzz/gzz/modules/pp/PPView2.java     Mon Nov  4 03:45:58 2002
@@ -116,6 +116,7 @@
 
            // CS from virtualpaper to screen
            final int paper2screen = glc.concat(framecenterCS, panZoom);
+           vs.matcher.addSub(frameCS, paper2screen, "PAPER2S");
            final int bg2screen = vs.scaleCS(paper2screen, "BGSCA", 
                                        bgscale, bgscale);
            
@@ -136,7 +137,9 @@
 
            // Irregu needs frame 2 paper
            final int screen2paper = glc.invert(paper2screen);
+           vs.matcher.addSub(paper2screen, screen2paper, "INVER2S");
            final int frameUnit2paper = glc.concat(screen2paper, frameUnit);
+           vs.matcher.addSub(screen2paper, frameUnit2paper, "f2pap");
 
            class Putter implements Runnable {
                Vob v;
@@ -198,6 +201,7 @@
            final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
                    -buoyVPWidth/2, -buoyVPHeight, 1, 1, 
                    buoyVPWidth, buoyVPHeight);
+           vs.activate(frameCS);
            // XXX Pan
            final int c2fCS = vs.coords.ortho(0, 0, 0, 0, buoyZoom, buoyZoom);
            vs.matcher.addSub(buoycs, c2fCS, "C2F");
@@ -251,6 +255,7 @@
        int frameCS = vs.orthoBoxCS(mainctr, "frame", 10, 
                (-mainWidth)/2, -mainHeight/2, 1, 1, 
                mainWidth, mainHeight);
+       vs.activate(frameCS);
 
        int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.addSub(mainctr, c2fCS, "C2F");
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.15 gzz/gzz/modules/pp/demotest.py:1.16
--- gzz/gzz/modules/pp/demotest.py:1.15 Sun Nov  3 23:35:39 2002
+++ gzz/gzz/modules/pp/demotest.py      Mon Nov  4 03:45:58 2002
@@ -120,6 +120,10 @@
        self.ppv.bgscale = 500
        self.poly = ["FILL", "LINE"]
     def key(self, key):
+       if key == "i":
+           print "INTERPLIST"
+           self.vs.dump()
+           print self.vs.matcher.interpList(self.vs.matcher)
        if key == "p":
            rotatelist(self.poly)
        if key == "s":
@@ -136,7 +140,12 @@
        self.vs = vs
     def mouse(self, ev):
        if ev.getID() == ev.MOUSE_CLICKED:
-           pass
+           vs = self.vs
+           cs = vs.coords.getCSAt(0, ev.getX(), ev.getY(), None)
+           print "CS"
+           while cs > 0:
+               print cs, vs.matcher.getKey(cs)
+               cs = vs.coords.getParent(cs)
        elif ev.getID() == ev.MOUSE_PRESSED:
            self.press = (ev.getX(), ev.getY())
            self.pzoom = self.ppv.zoom