[Gzz-commits] gzz/gzz/view PageSpanCellView.java buoy/buoyman...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/12 08:58:00

Modified files:
        gzz/view       : PageSpanCellView.java 
        gzz/view/buoy  : buoymanager.py pagespanNodes.py 

Log message:
        Sharpening the current pov

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.21 
gzz/gzz/view/PageSpanCellView.java:1.22
--- gzz/gzz/view/PageSpanCellView.java:1.21     Wed Feb 12 07:47:06 2003
+++ gzz/gzz/view/PageSpanCellView.java  Wed Feb 12 08:58:00 2003
@@ -185,6 +185,23 @@
            place(vs, scaled, importance, pixelscale);
        }
 
+       /** Make a request for loading the textures into memory.
+        */
+       public void request(float x, float y, float radius, float importance, 
float pixelscale) {
+           pa("Request: "+x+" "+y+" "+radius);
+           float curx = 0;
+           for(int p = 0; p < npages; p++) {
+               float dx = Math.abs((curx + .5f * scale * xywh[4*p+2]) - x) - 
.5f*scale * xywh[4*p+2];
+               float dy = Math.abs((.5f * scale * xywh[4*p+3]) - y) - 
.5f*scale * xywh[4*p+3];
+               pa("RequestCoords: "+xywh[4*p+0]+" "+xywh[4*p+1]+" "+
+                                       xywh[4*p+2]+" "+xywh[4*p+3]);
+               if(dx < radius && dy < radius) {
+                   pa("Request DO: "+dx+" "+dy);
+                   psps[p].request(importance, pixelscale);
+               }
+               curx += scale * xywh[4*p + 2];
+           }
+       }
 
     }
 
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.27 
gzz/gzz/view/buoy/buoymanager.py:1.28
--- gzz/gzz/view/buoy/buoymanager.py:1.27       Wed Feb 12 08:08:20 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Wed Feb 12 08:58:00 2003
@@ -38,7 +38,6 @@
        self.vs.matcher.add(cs, n, "NADIR")
        return n
     def scene(self, vs):
-       print "SCENE"
        self.vs = vs
        self.cs = { }
 
@@ -76,10 +75,8 @@
         self.mainCS = main
 
     def link(self, *args):
-       print "Store link:",args
        self.links.append(args)
     def linkReally(self, direction, anchorCS, otherNode, linkId, otherAnchor):
-        print 'anchorCS: ',anchorCS
        anchorUnit = self.vs.unitSqCS(anchorCS, "UN")
        anchorCenter = self.vs.translateCS(anchorUnit, "TR55", .5, .5)
        x = self.ctrx
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.27 
gzz/gzz/view/buoy/pagespanNodes.py:1.28
--- gzz/gzz/view/buoy/pagespanNodes.py:1.27     Wed Feb 12 08:08:20 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Wed Feb 12 08:58:00 2003
@@ -178,10 +178,15 @@
                        self.listener.link(dir, thisEndCS,
                                
self.nodetype.scrollBlockLinker.xulinkPageSpanNodeType,
                                xulink, repr)
+       self.doReq()
+
+    def doReq(self):
+       self.layout.request(self.fisheye.curx, self.fisheye.cury, 0, 1, 2000)
 
     def mouse(self, mouseEvent, oldVS):
        if self.fisheye.event(mouseEvent):
            self.fisheye.setCoordsysParams()
+           self.doReq()
            return 1
        if mouseEvent.getID() == mouseEvent.MOUSE_CLICKED:
            # print "MOUSE PSPMAIN ",mouseEvent
@@ -207,6 +212,7 @@
            if y > self.layout.h: y = self.layout.h
            self.fisheye.setCenter(x, y)
            gzz.client.AbstractUpdateManager.chg()
+           self.doReq()
            # self.setShift(oldVS)
            return 0
        return 0