[Gzz-commits] fenfire/org/fenfire/view TextNodeView.java pape...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/05/12 00:33:11

Modified files:
        org/fenfire/view: TextNodeView.java papercanvas2d.test 

Log message:
        editing the failing test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.3 
fenfire/org/fenfire/view/TextNodeView.java:1.4
--- fenfire/org/fenfire/view/TextNodeView.java:1.3      Wed May  7 00:08:05 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Mon May 12 00:33:11 2003
@@ -37,6 +37,9 @@
  *  currently, places text as a single very long line.
  */
 public class TextNodeView implements NodeFunction {
+public static final String rcsid = "$Id: TextNodeView.java,v 1.4 2003/05/12 
04:33:11 tjl Exp $";
+    public static boolean dbg = false;
+    private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
 
     final NodeFunction nodeContent;
     final TextStyle style;
@@ -58,6 +61,10 @@
        final TextVob vob = new TextVob(style, s, false);
        final float width = style.getWidth(s, scale);
        final float height = style.getHeight(scale);
+
+       if(dbg) {
+           pa("Textnodeview: '"+s+"' "+width+" "+height);
+       }
 
        return new org.nongnu.libvob.lava.placeable.Placeable() {
                public void place(VobScene vs, int into) {
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.3 
fenfire/org/fenfire/view/papercanvas2d.test:1.4
--- fenfire/org/fenfire/view/papercanvas2d.test:1.3     Sun May 11 12:10:21 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Mon May 12 00:33:11 2003
@@ -9,6 +9,9 @@
 
 ff.test.gfx.needGL()
 
+ff.view.CanvasView2D.dbg = 1
+ff.view.TextNodeView.dbg = 1
+
 from org.fenfire.test.gfx import *
 
 class DummyMill(vob.gl.PaperMill):
@@ -61,13 +64,15 @@
 
     irregu2D = ff.view.IrregularViewportView2D(paperView2D)
 
+    view2D = paperView2D
+
     # Finally, create the vobscene
-    vs.put(SolidBackdropVob(Color.black))
+    vs.put(SolidBackdropVob(Color.red))
 
     box2screen = vs.orthoBoxCS(0, "b2s", 0, 100, 100, 1, 1, 300, 300)
-    box2plane = vs.orthoBoxCS(0, "b2p", 0, 0, 0, .5, .5, 300, 300)
+    box2plane = vs.orthoBoxCS(0, "b2p", 0, 0, 0, 2, 2, 300, 300)
     
-    irregu2D.render(vs, nodec, box2screen, box2screen, box2plane)
+    view2D.render(vs, nodec, box2screen, box2screen, box2plane)
 
     render(vs)