[Gzz-commits] gzz gzz/view/PageSpanCellView.java test/gzz/vie...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/29 04:50:17

Modified files:
        gzz/view       : PageSpanCellView.java 
        test/gzz/view  : pagespancellview.test 
        test/tools     : gfx.py 

Log message:
        Centering works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/pagespancellview.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/tools/gfx.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.2 
gzz/gzz/view/PageSpanCellView.java:1.3
--- gzz/gzz/view/PageSpanCellView.java:1.2      Wed Jan 29 03:50:46 2003
+++ gzz/gzz/view/PageSpanCellView.java  Wed Jan 29 04:50:17 2003
@@ -77,9 +77,12 @@
            if(!foundCenter && center != null && center.intersects(pages[p])) {
                foundCenter = true;
                Point l_c = center.getLocation(); // XXX Center?
+               Dimension d_c = center.getSize(); // XXX Center?
 
-               xoffs = w + scale * (psps[p].getX(l_c.x) - xywh[4*p + 0]);
-               yoffs = scale * (psps[p].getY(l_c.y) - xywh[4*p + 1]);
+               xoffs = w + scale * (psps[p].getX(l_c.x + .5f * d_c.width) - 
xywh[4*p + 0]);
+               yoffs = scale * (psps[p].getY(l_c.y + .5f * d_c.height) - 
xywh[4*p + 1]);
+               if(dbg) pa("Center found: "+p+" "+pages[p]+" "+
+                           xoffs + " " + yoffs);
                
            }
            w += scale * xywh[4*p + 2];
Index: gzz/test/gzz/view/pagespancellview.test
diff -u gzz/test/gzz/view/pagespancellview.test:1.2 
gzz/test/gzz/view/pagespancellview.test:1.3
--- gzz/test/gzz/view/pagespancellview.test:1.2 Wed Jan 29 03:50:46 2003
+++ gzz/test/gzz/view/pagespancellview.test     Wed Jan 29 04:50:17 2003
@@ -23,8 +23,9 @@
     global exc
     typ, val, tra = sys.exc_info()
     print (repr((typ, val)))
-    print str(val)
-    exc = "\n".join(traceback.format_list(traceback.extract_tb(tra)))
+    # print str(val)
+    exc = str(val) + 
"\n".join(traceback.format_list(traceback.extract_tb(tra)))
+    print exc
 
 def checkColors(x, y):
     try:
@@ -64,7 +65,9 @@
 
     """
 
-    for i in range(0, 30):
+    passed = 0
+
+    for i in range(0, 50):
        gzz.client.AbstractUpdateManager.tickIdle()
 
        vs = getvs()
@@ -76,18 +79,37 @@
        v.useBg = 0
 
 
-       scaled = vs.orthoCS(0, "X", 0, 100, 100, .2, .2)
+       scaled = vs.orthoCS(0, "X", 0, 150, 150, .2, .2)
        v.placeCentered(enfMaker.makeEnfilade(sc.getCurrent()), vs, scaled, 
                        None, None, 1, 100000)
 
        render(vs)
 
-       if checkColors(100, 100): return 
+       if checkColors(150, 150): 
+           print "PASS!"
+           passed = 1
+           break
+
+       Thread.sleep(300)
+
+    failUnlessEqual(passed, 1, "didn't get the image " + exc)
+
+    # Now that the images are loaded, check span offsets
+    vs = getvs()
+    vs.map.put(SolidBgVob(Color.yellow))
+    scaled = vs.orthoCS(0, "X", 0, 200, 150, .2, .2)
+    v.placeCentered(enfMaker.makeEnfilade(sc.getCurrent()), vs, scaled, 
+           None, sc.getCurrent().subSpan(1), 1, 100000)
+    render(vs)
+    if not checkColors(int(200 - 1.5 * 612 / 5.0), 
+                           int(150 - .5 * 792 / 5.0)):
+       fail(exc)
+
+    
+
+
 
-       Thread.sleep(100)
 
-    failUnlessEqual("didn't get the image " + exc, 0, 1)
 
-    
 
 # : vim: set syntax=python :
Index: gzz/test/tools/gfx.py
diff -u gzz/test/tools/gfx.py:1.17 gzz/test/tools/gfx.py:1.18
--- gzz/test/tools/gfx.py:1.17  Sun Jan 26 10:06:54 2003
+++ gzz/test/tools/gfx.py       Wed Jan 29 04:50:17 2003
@@ -44,7 +44,7 @@
 
 def failUnless(b, msg=None):
     if not b:
-       raise str("FU ",msg)
+       raise str(("FU ",msg))
 
 def getvs():
     return win.createVobScene()