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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/13 10:38:38

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

Log message:
        Start deblurring

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.23 
gzz/gzz/view/PageSpanCellView.java:1.24
--- gzz/gzz/view/PageSpanCellView.java:1.23     Thu Feb 13 09:39:30 2003
+++ gzz/gzz/view/PageSpanCellView.java  Thu Feb 13 10:38:38 2003
@@ -189,17 +189,24 @@
 
        /** 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);
+       public void request(float x, float y, float radius, 
+                       float importanceAt, 
+                       float importanceOutside,
+                       float pixelscale) {
+           if(dbg) 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]+" "+
+               if(dbg) 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);
+               float dist = Math.max(dx, dy);
+               if(dist < 0) {
+                   psps[p].request(importanceAt, pixelscale);
+               } else if(dist < radius) {
+                   if(dbg) pa("Request DO: "+dx+" "+dy);
+                   psps[p].request(importanceOutside * (1-dist/radius),
+                                    pixelscale);
                }
                curx += scale * xywh[4*p + 2];
            }
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.35 
gzz/gzz/view/buoy/pagespanNodes.py:1.36
--- gzz/gzz/view/buoy/pagespanNodes.py:1.35     Thu Feb 13 10:28:09 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Thu Feb 13 10:38:38 2003
@@ -35,7 +35,7 @@
            vs.map.put(data.irregu.content, paperCS, viewport)
     class LayoutR(java.lang.Runnable):
        def run(rself):
-           data.layout.place(vs, paperCS, .6, 200, cull)
+           data.layout.place(vs, paperCS, .05, 100, cull)
     
     gzz.gfx.gl.Stencil.drawStenciled(vs, ContentR(), None, FrameR(), 
LayoutR(), 1)
 
@@ -85,7 +85,7 @@
        scaled = vs.coords.scale(unit, 
                    1.0 / data.layout.w, 1.0 / data.layout.h)
        vs.matcher.add(into, scaled, "LAYOUT")
-       data.layout.place(vs, scaled, .3, 100)
+       data.layout.place(vs, scaled, .05, 50)
 
        return into
 
@@ -209,7 +209,8 @@
        self.doReq()
 
     def doReq(self):
-       self.data.layout.request(self.fisheye.curx, self.fisheye.cury, 0, 1, 
2000)
+       self.data.layout.request(self.fisheye.curx, self.fisheye.cury, 
+                           self.data.layout.w, 1, .8, 2000)
 
     def mouse(self, mouseEvent, oldVS):
        if self.fisheye.event(mouseEvent):