[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/03 13:41:46

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

Log message:
        Panning

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.356&tr2=1.357&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.356 gzz/TODO:1.357
--- gzz/TODO:1.356      Sun Nov  3 13:28:16 2002
+++ gzz/TODO    Sun Nov  3 13:41:46 2002
@@ -103,12 +103,12 @@
        - PP [deadline 5.11]
            - refactor
                - implement using the new gzz.view classes
-                   - panning
                    - buoys
                    - hopping to buoy - keying, animation
            - make it work again
                - bindings
                - mouse click coordinates
+           - calendar bg
            - images
            - nadir
            - fix directory geometry
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.4 gzz/gzz/modules/pp/PPView2.java:1.5
--- gzz/gzz/modules/pp/PPView2.java:1.4 Sun Nov  3 13:28:16 2002
+++ gzz/gzz/modules/pp/PPView2.java     Sun Nov  3 13:41:46 2002
@@ -16,6 +16,10 @@
      */
     public float zoom = 1;
 
+    /** The current virtual-paper coordinates.
+     */
+    public float panx=0, pany=0;
+
     /** The scale of the background.
      * bgscale in paper coordinates = 1 in background coords.
      */
@@ -113,8 +117,12 @@
                        new Putter(f.getFrame()),
                        placeContent,
                        true);
-           else
+           else {
+               (new Putter(f.getContent())).run();
+               (new Putter(f.getFrame())).run();
+               (new Putter(f.getBlank())).run();
                placeContent.run();
+           }
        }
     }
 
@@ -150,6 +158,6 @@
      */
     public void setZoomPan(VobScene vs) {
        int cs = vs.matcher.getCS("C2F");
-       vs.coords.setOrthoParams(cs, 0, 0, 0, zoom, zoom);
+       vs.coords.setOrthoParams(cs, 0, -panx*zoom, -pany*zoom, zoom, zoom);
     }
 }
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.13 gzz/gzz/modules/pp/demotest.py:1.14
--- gzz/gzz/modules/pp/demotest.py:1.13 Sun Nov  3 13:28:16 2002
+++ gzz/gzz/modules/pp/demotest.py      Sun Nov  3 13:41:46 2002
@@ -118,12 +118,18 @@
     def __init__(self):
        self.ppv = PPView2(space, w)
        self.ppv.bgscale = 500
+       self.poly = ["FILL", "LINE"]
     def key(self, key):
+       if key == "p":
+           rotatelist(self.poly)
        if key == "s":
            self.ppv.useStencil = not self.ppv.useStencil
        pass
     def scene(self, vs):
        vs.map.put(background((0.4,0.5,0.8)))
+       vs.map.put(getDListNocoords("""
+           PolygonMode FRONT_AND_BACK %s
+       """ % (self.poly[0],)))
        avc = gzz.view.AbstractViewContext()
        avc.setAccursed(space.getCell(n1))
        self.ppv.render(vs, 0, avc)
@@ -134,20 +140,22 @@
        elif ev.getID() == ev.MOUSE_PRESSED:
            self.press = (ev.getX(), ev.getY())
            self.pzoom = self.ppv.zoom
+           self.poffset = (self.ppv.panx, self.ppv.pany)
            self.but = ev.getModifiers()
        elif ev.getID() == ev.MOUSE_DRAGGED:
            if self.but == ev.BUTTON3_MASK:
                self.ppv.zoom = self.pzoom * math.exp(
                        (self.press[1] - ev.getY())/150.0)
-               self.ppv.setZoomPan(self.vs)
-               replaceNewScene(self.vs)
-               AbstractUpdateManager.setNoAnimation()
-               AbstractUpdateManager.chg()
+               print self.ppv.zoom
            elif self.but == ev.BUTTON1_MASK:
-               self.offset = (
-                self.poffset[0] - (ev.getX() - self.press[0]),
-                self.poffset[1] - (ev.getY() - self.press[1]),
-                )
+               self.ppv.panx = self.poffset[0] - (ev.getX() - self.press[0])
+               self.ppv.pany = self.poffset[1] - (ev.getY() - self.press[1])
+           else:
+               return
+           self.ppv.setZoomPan(self.vs)
+           replaceNewScene(self.vs)
+           AbstractUpdateManager.setNoAnimation()
+           AbstractUpdateManager.chg()
 
 gzz.view.CoordinatePlaneView.dbg = 1