[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py impl/Simpl...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/25 11:40:31

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/impl: SimpleNodeContent.java 
        org/fenfire/modules/pp: Pp.java 

Log message:
        make compile with alph changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/impl/SimpleNodeContent.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.25 
fenfire/org/fenfire/demo/buoyoing.py:1.26
--- fenfire/org/fenfire/demo/buoyoing.py:1.25   Fri Apr 25 10:43:04 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri Apr 25 11:40:31 2003
@@ -35,6 +35,7 @@
         print k,"\t",v
 
 from org import fenfire as ff
+from org.fenfire.swamp import Nodes
 
 from org.nongnu import alph
 from org.nongnu import storm
@@ -52,11 +53,16 @@
 vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replacingScene
 vob.buoy.buoymanager.w = vob.putil.demo.w
 
+pool = storm.impl.TransientPool(java.util.HashSet())
+myalph = alph.impl.StormAlph(pool)
+sc = myalph.addFile(java.io.File('../alph/testdata/test1.pdf'), 
'application/pdf')
+enfMaker = alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()
+
 # Create fen with swamps.
 
 fen = ff.Fen()
 fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
-fen.txt = ff.impl.SimpleNodeContent(fen);
+fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
 fen.txtfunc = fen.txt.getNodeFunction()
 
 # Create the buoy view elements
@@ -96,82 +102,7 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
-xulinks = 0
-
-canvases = 1
-
-# /BIG/PAPERART/ht/p16-furnas.pdf -- 
urn:x-storm:1.0:application/pdf,j4vb6u6cumtnstfusywhht3avhn2ujan.57hmjk7o7yqehac5mom3e3hvgckjq6xakx6o7qy
-
-if xulinks:
-    xuspace = ff.impl.ModularSpace(
-           ff.impl.SimpleVStreamTexter(
-                   alph.impl.FakeSpanMaker(),
-                   alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()),
-           model
-       )
-    xuindexer = ff.index.IndexManager.getXuIndexer(xuspace)
-
-
-    pagescrolls = (
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # "Focus+context views of World-Wide Web nodes"
-    "01F8679C51FC1E410829DB31E838B9F15551F8E1F0")),
-
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # ""Digital Library Information Appliances""
-    "01A3F5119A280DE2AA5F58B1A9FF1B23F26022B4E0")),
-
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # "Fluid Links for Informed and Incremental Link Transitions"
-    "01E941CB556ACB221B3909F6203E1763B7CA9A74B4")),
-
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # "The mind's views of space"
-    "011CA01BE52823106ED33F2C086FF8E7CCF9921A8D")),
-
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # "A Zooming Web Browser"
-    "015482A47DAA0FFAE5AA3084954C4D26DA9356C2BD")),
-
-    PageImageScroll(None, storm.Mediaserver.Id(
-    # "Generalized fisheye views"
-    "01F8C8A93BE231D1CAC9C9C9AC79D130246B287298"))
-    )
-
-
-    pagespans = [scroll.getCurrent() for scroll in pagescrolls]
-
-    print 'FOOOOOOOO'
-
-    if 1:
-       xuindexer.add(XuLink(
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[0].subSpan(0,1).subArea(300,350,30,200)),
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[1].subSpan(0,1).subArea(220,250,370,240))
-           ))
-        print 'FOOOOOOOO'
-
-       xuindexer.add(XuLink(
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[1].subSpan(1,2).subArea(0,300,350,300)),
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[0].subSpan(2,3).subArea(300,400,300,200)),
-           ))
-
-       xuindexer.add(XuLink(
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[3].subSpan(1,2).subArea(0,200,350,200)),
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[0].subSpan(3,4).subArea(300,400,30,40)),
-           ))
-
-       xuindexer.add(XuLink(
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[0].subSpan(1,2).subArea(20,40,332,220)),
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[4].subSpan(2,3).subArea(300,150,280,240)),
-           ))
-
-       xuindexer.add(XuLink(
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[5].subSpan(1,2).subArea(0,240,350,200)),
-           
ff.view.buoy.pagespanNodes.makeEnf(pagespans[0].subSpan(0,1).subArea(470,100,30,20)),
-           ))
-
-if canvases:
-
+if 1:
     global linkid1
 
     # try out some notes..
@@ -180,12 +111,15 @@
     #wholepage = pg0.getCurrent().subSpan(0,1)
     #span = wholepage.subArea(70, 50, 400, 100)
     paperA = ppAct.newPaper()
-    note1 = ppAct.newNote(paperA, 0,0, 'This is a test!')
-    note1b = ppAct.newNote(paperA, 100, 100, 'This is translated by 
(100,100)!')
+    note1 = Nodes.get(ppAct.newNote(paperA, 0,0, 'This is a test!'))
+    note1b = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
+
+    span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
+    fen.txt.set(note1b, enfMaker.makeEnfilade(span))
     #linkid1 = addTrans(span, paper)
 
     paperB = ppAct.newPaper()
-    note2 = ppAct.newNote(paperB, 10,30, 'This is an another test!')
+    note2 = Nodes.get(ppAct.newNote(paperB, 10,30, 'This is an another test!'))
 
     ppAct.assocNotes(note1, 1, note2)
 
@@ -206,7 +140,7 @@
 # irregu.border = 10
 irregu.type = 2
 
-plane = ff.swamp.Nodes.get(paperA)
+plane = Nodes.get(paperA)
 
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
 # mainNode = ff.view.buoy.MainNode2D(plane, paperview)
Index: fenfire/org/fenfire/impl/SimpleNodeContent.java
diff -u fenfire/org/fenfire/impl/SimpleNodeContent.java:1.6 
fenfire/org/fenfire/impl/SimpleNodeContent.java:1.7
--- fenfire/org/fenfire/impl/SimpleNodeContent.java:1.6 Thu Apr 24 09:29:12 2003
+++ fenfire/org/fenfire/impl/SimpleNodeContent.java     Fri Apr 25 11:40:31 2003
@@ -4,6 +4,7 @@
 import java.io.StringBufferInputStream;
 
 import org.nongnu.alph.Enfilade1D;
+import org.nongnu.alph.Alph;
 import org.nongnu.alph.xml.SpanReader;
 import org.nongnu.alph.xml.SpanSerializer;
 
@@ -20,9 +21,9 @@
 
 public class SimpleNodeContent implements NodeContent {
     public static boolean dbg = true;
-public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.6 
2003/04/24 13:29:12 tjl Exp $";
+public static final String rcsid = "$Id: SimpleNodeContent.java,v 1.7 
2003/04/25 15:40:31 benja Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
-    SpanReader spanReader = new SpanReader();
+    SpanReader spanReader;
 
     javax.xml.parsers.SAXParser saxParser;
 
@@ -32,7 +33,13 @@
 
     Fen fen;
 
-    public SimpleNodeContent(Fen fen) {
+    /**
+     *  @param alph The Alph to load scroll blocks from.
+     *              If <code>null</code>, only urn-5 spans
+     *              can be used.
+     */
+    public SimpleNodeContent(Fen fen, Alph alph) {
+       this.spanReader = new SpanReader(alph);
        try {
            saxParser = 
javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser();
        } catch(Exception e) {
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.34 
fenfire/org/fenfire/modules/pp/Pp.java:1.35
--- fenfire/org/fenfire/modules/pp/Pp.java:1.34 Fri Apr 25 07:19:39 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java      Fri Apr 25 11:40:31 2003
@@ -28,7 +28,7 @@
 
 
 public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.34 2003/04/25 11:19:39 
tjl Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.35 2003/04/25 15:40:31 
benja Exp $";
     public static final boolean dbg = false;
     protected static void pa(String s) { System.out.println("Pp::"+s); }
 
@@ -62,7 +62,7 @@
        fen = new Fen();
        fen.constgraph = fen.graph = new HashGraph();
        //fen.enfiladeOverlap = new XXX
-       fen.txt = new SimpleNodeContent(fen);
+       fen.txt = new SimpleNodeContent(fen, null);
        fen.txtfunc = new CachedNodeFunction(500, fen.constgraph, 
                    fen.txt.getNodeFunction());