[Gzz-commits] gzz/gzz/modules/pp demotest.py

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/26 03:06:50

Modified files:
        gzz/modules/pp : demotest.py 

Log message:
        New paper -button needs ppactions.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.22 gzz/gzz/modules/pp/demotest.py:1.23
--- gzz/gzz/modules/pp/demotest.py:1.22 Tue Nov  5 14:00:17 2002
+++ gzz/gzz/modules/pp/demotest.py      Tue Nov 26 03:06:50 2002
@@ -34,10 +34,10 @@
 n1_2 = ppactions.newNote(id, 100, 200, "Foog")
 n1_3 = ppactions.newNote(id, 0, 0, "KOTI")
 
-np = ppactions.newPaper()
-n2 = ppactions.newNote(np, 100, 50, "VALOKUVAT")
-n2 = ppactions.newNote(np, 100, 100, "IMG:/BIG/0000_022.jpg")
-ppactions.assocNotes(n1_2, 1, n2)
+#np = ppactions.newPaper()
+#n2 = ppactions.newNote(np, 100, 50, "VALOKUVAT")
+#n2 = ppactions.newNote(np, 100, 100, "IMG:/BIG/0000_022.jpg")
+#ppactions.assocNotes(n1_2, 1, n2)
 
 np = ppactions.newPaper()
 space.getCell(np).N(d.bgtype)
@@ -58,77 +58,10 @@
     (i, Math.random() * 100, Math.random() * 100)
     for i in range(0,1)]
 
-class PlaneViewScene:
-    def __init__(self):
-       self.scale = 0.01
-       self.floatbuoys = 1
-       self.offset = (0,0)
-    def scene(self, vs):
-       self.currentvs = vs
-       dim = vs.getSize()
-
-       ctr = (dim.width/2, dim.height/2)
-       # XXX!!! Viewport widht, height must be same
-       # because of concatenating transforms 
-       (w,h) = 600, 600
-
-       r = 400
-       lbf = effects.CircleFloater4(vs, 0, ctr, r, (ctr[0]+r,ctr[1]))
-       rbf = effects.CircleFloater4(vs, 0, ctr, r, (ctr[0]-r,ctr[1]))
-       self.pv = PlaneView(VobKeyer(), lbf, rbf)
-
-       vs.map.put(background((0.4,0.5,0.8)))
-       # Viewport
-       self.cs1 = vs.coords.ortho(0, 0, ctr[0]-w/2, ctr[1]-h/2, w, h)
-       # Paper to viewport
-       self.cs2 = vs.coords.affineCoordsys(0, 0, 0, 0, 0, 0, 0, 0)
-       self.sap()
-       vs.matcher.add(self.cs1, "Global")
-       vs.matcher.add(self.cs2, "p")
-       # vs.map.put(clip, self.cs1)
-       self.pv.renderPaper(vs, cursor[0], -1, self.cs1, self.cs2, 1)
-       # vs.map.put(getDListNocoords("""Disable TEXTURE_2D"""))
-       # vs.map.put(coloredQuad((1,0,0)), self.cs1)
-       # vs.map.put(stopclip, self.cs1)
-
-    def key(self, key):
-       if key == "c":
-           rotatelist(cursor)
-    def mouse(self, ev):
-       if ev.getID() == ev.MOUSE_CLICKED:
-           pass
-       elif ev.getID() == ev.MOUSE_PRESSED:
-           self.press = (ev.getX(), ev.getY())
-           self.pscale = self.scale
-           self.poffset = self.offset
-           self.but = ev.getModifiers()
-       elif ev.getID() == ev.MOUSE_DRAGGED:
-           if self.but == ev.BUTTON3_MASK:
-               self.scale = self.pscale * math.exp(
-                       (self.press[1] - ev.getY())/150.0)
-               self.sap()
-               replaceNewScene(self.currentvs)
-               AbstractUpdateManager.setNoAnimation()
-               AbstractUpdateManager.chg()
-           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.sap()
-               replaceNewScene(self.currentvs)
-               AbstractUpdateManager.setNoAnimation()
-               AbstractUpdateManager.chg()
-    def sap(self):
-       self.currentvs.coords.setAffineParams(self.cs2,
-               0, -self.scale*self.offset[0]+.5, 
-                  -self.scale*self.offset[1]+.5, 
-               self.scale, 0, 0, self.scale)
-
 class PPView2Scene:
     def __init__(self):
        w.setLocation(0,0,1024,768)
-       self.ppv = PPView2(space, w)
+       self.ppv = PPView2(space, w, ppactions)
        self.ppv.bgscale = 500
        self.poly = ["FILL", "LINE"]
        self.avc = gzz.view.AbstractViewContext()
@@ -217,3 +150,80 @@
 
 # currentScene = PlaneViewScene()
 currentScene = PPView2Scene()
+
+
+
+
+
+
+
+
+
+# OLD
+
+class PlaneViewScene:
+    def __init__(self):
+       self.scale = 0.01
+       self.floatbuoys = 1
+       self.offset = (0,0)
+    def scene(self, vs):
+       self.currentvs = vs
+       dim = vs.getSize()
+
+       ctr = (dim.width/2, dim.height/2)
+       # XXX!!! Viewport widht, height must be same
+       # because of concatenating transforms 
+       (w,h) = 600, 600
+
+       r = 400
+       lbf = effects.CircleFloater4(vs, 0, ctr, r, (ctr[0]+r,ctr[1]))
+       rbf = effects.CircleFloater4(vs, 0, ctr, r, (ctr[0]-r,ctr[1]))
+       self.pv = PlaneView(VobKeyer(), lbf, rbf)
+
+       vs.map.put(background((0.4,0.5,0.8)))
+       # Viewport
+       self.cs1 = vs.coords.ortho(0, 0, ctr[0]-w/2, ctr[1]-h/2, w, h)
+       # Paper to viewport
+       self.cs2 = vs.coords.affineCoordsys(0, 0, 0, 0, 0, 0, 0, 0)
+       self.sap()
+       vs.matcher.add(self.cs1, "Global")
+       vs.matcher.add(self.cs2, "p")
+       # vs.map.put(clip, self.cs1)
+       self.pv.renderPaper(vs, cursor[0], -1, self.cs1, self.cs2, 1)
+       # vs.map.put(getDListNocoords("""Disable TEXTURE_2D"""))
+       # vs.map.put(coloredQuad((1,0,0)), self.cs1)
+       # vs.map.put(stopclip, self.cs1)
+
+    def key(self, key):
+       if key == "c":
+           rotatelist(cursor)
+    def mouse(self, ev):
+       if ev.getID() == ev.MOUSE_CLICKED:
+           pass
+       elif ev.getID() == ev.MOUSE_PRESSED:
+           self.press = (ev.getX(), ev.getY())
+           self.pscale = self.scale
+           self.poffset = self.offset
+           self.but = ev.getModifiers()
+       elif ev.getID() == ev.MOUSE_DRAGGED:
+           if self.but == ev.BUTTON3_MASK:
+               self.scale = self.pscale * math.exp(
+                       (self.press[1] - ev.getY())/150.0)
+               self.sap()
+               replaceNewScene(self.currentvs)
+               AbstractUpdateManager.setNoAnimation()
+               AbstractUpdateManager.chg()
+           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.sap()
+               replaceNewScene(self.currentvs)
+               AbstractUpdateManager.setNoAnimation()
+               AbstractUpdateManager.chg()
+    def sap(self):
+       self.currentvs.coords.setAffineParams(self.cs2,
+               0, -self.scale*self.offset[0]+.5, 
+                  -self.scale*self.offset[1]+.5, 
+               self.scale, 0, 0, self.scale)