[ff-cvs] libvob doc/pegboard/.cvsignore test/vob/api/vob...

[Matti Katila]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/18 06:34:37

Modified files:
        doc/pegboard   : .cvsignore 
        test/vob/api   : vobcoorder.test vobmatcher.test 
        test/vob/vobs  : textvob.test 
        vob/demo/multifil: multifil.py 
Added files:
        org/nongnu/libvob/lava/placeable: TextPlaceable.java 

Log message:
        org/nongnu/libvob/lava/placeable/TextPlaceable.java

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/doc/pegboard/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/lava/placeable/TextPlaceable.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobcoorder.test.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobmatcher.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/vobs/textvob.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/demo/multifil/multifil.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: libvob/doc/pegboard/.cvsignore
diff -u libvob/doc/pegboard/.cvsignore:1.1 libvob/doc/pegboard/.cvsignore:1.2
--- libvob/doc/pegboard/.cvsignore:1.1  Mon Mar 31 05:00:03 2003
+++ libvob/doc/pegboard/.cvsignore      Mon Aug 18 06:34:36 2003
@@ -1 +1,2 @@
 *.gen.*
+get_activated--mudyc
Index: libvob/test/vob/api/vobcoorder.test
diff -u libvob/test/vob/api/vobcoorder.test:1.15 
libvob/test/vob/api/vobcoorder.test:1.16
--- libvob/test/vob/api/vobcoorder.test:1.15    Thu Jul 31 04:58:00 2003
+++ libvob/test/vob/api/vobcoorder.test Mon Aug 18 06:34:36 2003
@@ -1,3 +1,4 @@
+# -*-python-*-
 # 
 # Copyright (c) 2003, Tuomas J. Lukka and Asko Soukka
 # 
Index: libvob/test/vob/api/vobmatcher.test
diff -u libvob/test/vob/api/vobmatcher.test:1.3 
libvob/test/vob/api/vobmatcher.test:1.4
--- libvob/test/vob/api/vobmatcher.test:1.3     Thu May 15 13:19:03 2003
+++ libvob/test/vob/api/vobmatcher.test Mon Aug 18 06:34:37 2003
@@ -34,3 +34,17 @@
 
     for i in range(1,42):
        failUnlessEqual(v.getKey(i), keys[i])
+
+
+def testGetCS():
+    v = vob.impl.DefaultVobMatcher()
+
+    keys = {}
+
+    for i in range(1,42):
+       keys[i] = str(i)+"foo"
+       v.add(i, keys[i])
+
+    for i in range(1,42):
+       assert v.getKey(i) == keys[i]
+       assert i == v.getCS(keys[i])
Index: libvob/test/vob/vobs/textvob.test
diff -u libvob/test/vob/vobs/textvob.test:1.4 
libvob/test/vob/vobs/textvob.test:1.5
--- libvob/test/vob/vobs/textvob.test:1.4       Sun Aug 17 17:00:15 2003
+++ libvob/test/vob/vobs/textvob.test   Mon Aug 18 06:34:37 2003
@@ -76,4 +76,22 @@
        """The bottom side."""
        checkAvgColor(100, 100+text_height+text_depth+10, text_width, 10, (255, 
0, 0), delta=1)
 
+
+def testEmpty():
+       text_scale = 1
+       vs = getvs()
+       size = vs.getSize()
+       vs.map.put(vob.vobs.SolidBackdropVob(Color.red))
+       textvob = vob.vobs.TextVob(sty1, None)
+
+       text_width = int(textvob.getWidth(text_scale))
+       text_height = int(textvob.getHeight(text_scale))
+       text_depth = int(textvob.getDepth(text_scale))
+
+       cs = vs.orthoBoxCS(0, "window",  0, 100, 100, 1, 1, size.width, 
size.height)
+       cs_text = vs.orthoCS(cs, "text", 0, 0, 0, text_height + text_depth, 
text_height + text_depth)
+       vs.map.put(textvob, cs_text)
+       render(vs)
+
+
 # : vim: set syntax=python :
Index: libvob/vob/demo/multifil/multifil.py
diff -u libvob/vob/demo/multifil/multifil.py:1.21 
libvob/vob/demo/multifil/multifil.py:1.22
--- libvob/vob/demo/multifil/multifil.py:1.21   Thu Aug 14 08:24:41 2003
+++ libvob/vob/demo/multifil/multifil.py        Mon Aug 18 06:34:37 2003
@@ -52,7 +52,7 @@
        def pc(conns, cs):
            # vs.put(conns, [a,  b, c, d])
            # vs.put(conns, [b,  a, d, e]);
-           # vs.put(conns, [c,  a]);
+            # vs.put(conns, [c,  a]);
            # vs.put(conns, [d,  a, b]);
 
            vs.put(conns, cs + [b,  e]);
@@ -68,6 +68,7 @@
             vs.put(getDListNocoords("Color 1 0 0"))
 
            vs.put(conns, cs + [e, b, c]);
+
 #          vs.put(GLRen.createDebugSwitch("Fillets", 0));
 #          vs.put(GLRen.createDebugSwitch("VFillets", 0));
            #vs.put(GLRen.createDebugSwitch("Quadrics", 0));