[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py modules/pp...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/16 04:16:34

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/modules/pp: PPCanvasNode.java 

Log message:
        twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.6 
fenfire/org/fenfire/demo/buoyoing.py:1.7
--- fenfire/org/fenfire/demo/buoyoing.py:1.6    Wed Apr 16 04:10:33 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed Apr 16 04:16:34 2003
@@ -25,14 +25,17 @@
 import sys
 import imp
 
+del(sys.modules["org"])
+
 import org.fenfire
 import org.fenfire.view
 
 print "LOADING BUOYOING"
+for (k,v) in sys.modules.items():
+    print k,"\t",v
 
 import org.fenfire.view.buoy.pagespanNodes
 
-import vob
 import vob.putil.demo
 import vob.putil.demowindow
 import vob.putil.demokeys
@@ -47,7 +50,7 @@
 import jarray
 import imp
 
-from org import fenfire
+from org import fenfire as ff
 
 # XXX !!!
 
@@ -65,9 +68,8 @@
 
 from org.fenfire.index import XuLink
 
-
-from com.hp.hpl.mesa.rdf import jena
-from com.hp.hpl.mesa.rdf.jena import model, common
+#from com.hp.hpl.mesa.rdf import jena
+#from com.hp.hpl.mesa.rdf.jena import model, common
 
 import org.nongnu.libvob.buoy
 import org.nongnu.libvob.buoy.buoymanager
@@ -78,26 +80,25 @@
 # gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
 # gzz.gfx.gl.PageSpanPaper.paperMillWindow = w
 
-model = jena.mem.ModelMem()
+#model = jena.mem.ModelMem()
 
-# Create a space
-space = fenfire.impl.ModularSpace(
-       fenfire.impl.SimpleVStreamTexter(
-               alph.impl.FakeSpanMaker(),
-               alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()),
-       model
-    )
+# Create fen with swamps.
+
+fen = ff.Fen()
+fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
+fen.txt = ff.impl.CachingNodeContent(ff.impl.SimpleNodeContent(fen));
 
 # Create the buoy view elements
-scrollblockLinker = fenfire.view.buoy.ScrollBlockNodeLinker(space)
+scrollblockLinker = fenfire.view.buoy.ScrollBlockNodeLinker(fen)
 # scrollblockLinker.transclusionPageSpanNodeType = (
 #      pagespanNodes.WholePageSpanNodeType(scrollblockLinker)
 #      )
 
-# adaptor = BuoyAdaptor()
-# adaptor.cellNodes = [PPCanvasNode(d, space, w), zzNodes.VanishingNodeType()]
-# adaptor.cellLinkers = [PPLinker(d.clone, d.association), scrollblockLinker]
-# scrollblockLinker.cellNodeType = adaptor
+adaptor = ff.view.buoy.BuoyAdaptor()
+adaptor.nodes = [PPCanvasNode(fen, w, ff.view.DefaultNodeView())] #, 
zzNodes.VanishingNodeType()]
+adaptor.nodeLinkers = [PPLinker(fen), scrollblockLinker]
+
+scrollblockLinker.cellNodeType = adaptor
 
 # Now, before reading the xu stuff, render something 
 # to try to prevent NV driver
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.17 
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.18
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.17       Wed Apr 16 
03:51:05 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java    Wed Apr 16 04:16:34 2003
@@ -17,7 +17,7 @@
 
 
 public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.17 2003/04/16 
07:51:05 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.18 2003/04/16 
08:16:34 mudyc Exp $";  
     public static boolean dbg = true;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("PPCanvasNode::"+s); 
}
@@ -91,10 +91,12 @@
 
        if (GraphicsAPI.getInstance() instanceof GLAPI) {
            final int c2fCS = 
-               vs.orthoCS(into, "C2F",0,  -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
+               vs.coords.ortho(0,0, -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
+           vs.matcher.add(into, c2fCS, "C2F");
            final int c2fCSInv = 
-               vs.orthoCS(into, "C2FINV",0,  (float)pan[0], (float)pan[1], 
1/buoyZoom, 1/buoyZoom);
-
+               vs.coords.ortho(0,0, pan[0], pan[1], 1/buoyZoom, 1/buoyZoom);
+           vs.matcher.add(into, c2fCSInv, "C2FINV");
+           
            SinglePaper.i(fen, node, win, nodeview)
                .render(vs, into, c2fCS, c2fCSInv, null);