[Gzz-commits] fenfire/org/fenfire util/pagespanpaper.test vie...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/27 05:58:15

Modified files:
        org/fenfire/util: pagespanpaper.test 
        org/fenfire/view/buoy: pagespanNodes.py 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/pagespanNodes.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.6 
fenfire/org/fenfire/util/pagespanpaper.test:1.7
--- fenfire/org/fenfire/util/pagespanpaper.test:1.6     Thu Mar 27 04:06:55 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Thu Mar 27 05:58:14 2003
@@ -44,6 +44,7 @@
 from org.nongnu import alph
 from org.nongnu import storm
 
+vob.view.FisheyeState.dbg = 1
 
 from org.nongnu.libvob.gl import GL, GLRen, GLCache
 
Index: fenfire/org/fenfire/view/buoy/pagespanNodes.py
diff -u fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.5 
fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.6
--- fenfire/org/fenfire/view/buoy/pagespanNodes.py:1.5  Thu Mar 27 05:43:12 2003
+++ fenfire/org/fenfire/view/buoy/pagespanNodes.py      Thu Mar 27 05:58:15 2003
@@ -58,7 +58,9 @@
        def run(rself):
            data.layout.place(vs, paperCS, .05, 100, cull)
     
-    vob.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), LayoutR(), 1)
+    # vob.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), LayoutR(), 
1)
+    LayoutR().run()
+
 
 
 class ScrollblockData:
@@ -177,9 +179,6 @@
 
        xywh = self.data.layout.getExtents(anchorSpan, None)
 
-       #self.fisheye = gzz.view.FisheyeState(
-       #    1.1, .1, 5, 2, 1000
-       #)
 
        self.fisheye.setCenter(xywh[0] + .5 * xywh[2],
                                xywh[1] + .5 * xywh[3])
@@ -187,7 +186,7 @@
     def _linkEndCS(self, enf, key):
        """Make a coordinate system for the link end and return it.
        """
-       for repr in gzz.zzutil.Media.getScrollBlockRepresentatives(enf):
+       for repr in alph.util.EnfUtil.getScrollBlockRepresentatives(enf):
            if repr.getScrollBlock() == self.scrollBlock:
                xywh = self.data.layout.getExtents(repr, None)
                return self.vs.orthoBoxCS(self.shift, key, -20,
@@ -221,7 +220,7 @@
                                .enfiladeOverlap.getMatches(self.enf))
            for m in matches:
                enf = m.space.getCellTexter().getEnfilade(m, None)
-               linkId = gzz.util.Pair(m, self.scrollBlock)
+               linkId = vob.util.Pair(m, self.scrollBlock)
                thisEndCS = self._linkEndCS(enf, linkId)
                self.listener.link(-1, thisEndCS, 
                        self.nodetype.scrollBlockLinker.cellNodeType,
@@ -236,7 +235,7 @@
                    myenf = getattr(xulink, thisEndName)
                    thisEndCS = self._linkEndCS(myenf, xulink)
                    endenf = getattr(xulink, otherEndName)
-                   for repr in 
gzz.zzutil.Media.getScrollBlockRepresentatives(endenf):
+                   for repr in 
alph.util.EnfUtil.getScrollBlockRepresentatives(endenf):
                        self.listener.link(dir, thisEndCS,
                                
self.nodetype.scrollBlockLinker.xulinkPageSpanNodeType,
                                xulink, repr)
@@ -252,7 +251,7 @@
         if x > self.data.layout.w: x = self.data.layout.w
         if y > self.data.layout.h: y = self.data.layout.h
         self.fisheye.setCenter(x, y)
-        gzz.client.AbstractUpdateManager.chg()
+        vob.AbstractUpdateManager.chg()
         self.doReq()
 
     def mouse(self, mouseEvent, oldVS):
@@ -261,18 +260,18 @@
            self.doReq()
            return 1
        if mouseEvent.getID() == mouseEvent.MOUSE_CLICKED:
-           # print "MOUSE PSPMAIN ",mouseEvent
+           print "MOUSE PSPMAIN ",mouseEvent
            size[0] = mouseEvent.getX()
            size[1] = mouseEvent.getY()
            size[2] = 0
            tmp = jarray.zeros(3, 'f')
            oldVS.coords.inverseTransformPoints3(self.ctr, size, tmp)
-           # print "Ev - ctr: ",mouseEvent, tmp[0], tmp[1], tmp[2]
+           print "Ev - ctr: ",mouseEvent, tmp[0], tmp[1], tmp[2]
            oldVS.coords.inverseTransformPoints3(self.scale, size, tmp)
-           # print "Ev - scale: ",mouseEvent, tmp[0], tmp[1], tmp[2]
+           print "Ev - scale: ",mouseEvent, tmp[0], tmp[1], tmp[2]
 
            oldVS.coords.inverseTransformPoints3(self.shift, size, size)
-           # print "Ev: ",size[0], size[1], size[2]
+           print "Ev: ",size[0], size[1], size[2]
            # print "Self.xy was",self.x,self.y
            oldVS.coords.transformPoints3(self.shift, size, tmp)
            print "Retransformed:", tmp[0], tmp[1], tmp[2]