[ff-cvs] fenfire/org/fenfire fenpdf/appearance/views.py ...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/26 07:34:41

Modified files:
        org/fenfire/fenpdf/appearance: views.py 
        org/fenfire/view: PageNodeView.java 
Added files:
        org/fenfire/view: VobWrapperFunction.java 

Log message:
        vob wrapper function

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/VobWrapperFunction.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageNodeView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.17 
fenfire/org/fenfire/fenpdf/appearance/views.py:1.18
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.17 Tue Aug 26 03:11:49 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py      Tue Aug 26 07:34:40 2003
@@ -190,8 +190,12 @@
        return self.canvasview2d
 
     def getPageNodeView(self, color):
-       return ff.view.PageNodeView(self.fen.txtfunc, 
-                   self.papers.getSpanImageFactory(), color)
+       pageFunc = ff.view.PageNodeView(self.fen.txtfunc, 
+                   self.papers.getSpanImageFactory())
+        return ff.view.VobWrapperFunction(pageFunc,
+            vob.vobs.ContinuousLineVob(2,
+                [0,0,0 , 1,0,0 , 1,1,0 , 0,1,0], 1, 100, color))
+                                                                    
 
 
     def getAccursedNodeContentFunction(self):
Index: fenfire/org/fenfire/view/PageNodeView.java
diff -u fenfire/org/fenfire/view/PageNodeView.java:1.4 
fenfire/org/fenfire/view/PageNodeView.java:1.5
--- fenfire/org/fenfire/view/PageNodeView.java:1.4      Tue Aug 26 03:45:24 2003
+++ fenfire/org/fenfire/view/PageNodeView.java  Tue Aug 26 07:34:41 2003
@@ -40,32 +40,15 @@
 
     final NodeFunction nodeContent;
     final SpanImageFactory spanImageFactory;
-    final Color color;
 
     public PageNodeView(NodeFunction nodeContent,
-                       SpanImageFactory spanImageFactory,
-                       Color color) {
+                       SpanImageFactory spanImageFactory) {
        this.nodeContent = nodeContent;
        this.spanImageFactory = spanImageFactory;
-       this.color = color;
     }
 
     public Object f(ConstGraph g, Object node) {
        final Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
-       return new org.nongnu.libvob.lava.placeable.Placeable() {
-               private final PageSpanLayout page = new PageSpanLayout(enf, 
spanImageFactory);
-               private final Vob borders = 
-                   new org.nongnu.libvob.vobs.ContinuousLineVob(2, new float[]
-                       {0,0,0 , 1f,0,0 , 1f,1f,0 ,  0,1f,0}, true, 100, color);
-
-               public void place(VobScene vs, int into) {
-                   page.place(vs, into);
-                   int cs = vs.orthoCS(into, enf.toString(),0, 0,0, 
page.getWidth(), page.getHeight());
-                   vs.put(borders, cs);
-               }
-
-               public float getWidth() { return page.getWidth(); }
-               public float getHeight() { return page.getHeight(); }
-           };
+       return new PageSpanLayout(enf, spanImageFactory);
     }
 }