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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/24 15:08:57

Modified files:
        org/fenfire/demo: buoyoing.py 

Log message:
        Clean up buoyoing somewhat

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.16 
fenfire/org/fenfire/demo/buoyoing.py:1.17
--- fenfire/org/fenfire/demo/buoyoing.py:1.16   Thu Apr 24 14:52:10 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Apr 24 15:08:57 2003
@@ -22,44 +22,22 @@
 
 # Buoy-oriented interface - Next Generation demo
 
+dbg = 0
+
 import sys
-import imp
+import jarray
 
 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.putil.demo
-import vob.putil.demowindow
-import vob.putil.demokeys
+if dbg:
+    for (k,v) in sys.modules.items():
+        print k,"\t",v
 
-from org import fenfire
-
-import vob.paper.papermill
-fenfire.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
-fenfire.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
-
-
-import jarray
-import imp
+import vob
 
 from org import fenfire as ff
 
-# XXX !!!
-
-#fenfire.view.buoy.pagespanNodes = 
imp.new_module("org.fenfire.view.buoy.pagespanNodes")
-#execfile("org/fenfire/view/buoy/pagespanNodes.py", 
fenfire.view.buoy.pagespanNodes)
-
-print dir(fenfire.view.buoy)
-pagespanNodes = fenfire.view.buoy.pagespanNodes
-
 from org.nongnu import libvob as vob
 from org.nongnu import alph
 from org.nongnu import storm
@@ -67,18 +45,16 @@
 from org.nongnu.alph.impl import PageImageScroll
 
 from org.fenfire.index import XuLink
+from org.fenfire.vocab import PP
 
 import vob.buoy
-import vob.buoy.buoymanager
+
+ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
+ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
 
 vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replacingScene
 vob.buoy.buoymanager.w = vob.putil.demo.w
 
-# gzz.gfx.gl.PageSpanPaper.paperMill = gzz.gfx.gl.PaperMill.getInstance()
-# gzz.gfx.gl.PageSpanPaper.paperMillWindow = w
-
-#model = jena.mem.ModelMem()
-
 # Create fen with swamps.
 
 fen = ff.Fen()
@@ -87,13 +63,11 @@
 fen.txtfunc = fen.txt.getNodeFunction()
 
 # Create the buoy view elements
-scrollblockLinker = fenfire.view.buoy.ScrollBlockNodeLinker(fen)
+scrollblockLinker = ff.view.buoy.ScrollBlockNodeLinker(fen)
 # scrollblockLinker.transclusionPageSpanNodeType = (
-#      pagespanNodes.WholePageSpanNodeType(scrollblockLinker)
+#      ff.view.buoy.pagespanNodes.WholePageSpanNodeType(scrollblockLinker)
 #      )
 
-from org.fenfire.vocab import PP
-
 ppAct = ff.modules.pp.PPActionsImpl(fen)
 class PpContext(ff.view.NodeView.Context, ff.modules.pp.PpContext):
     def __init__(self, ppAc):
@@ -115,12 +89,6 @@
 
 
 nodeBuoyViewNodeType = ff.modules.pp.PPCanvasNode(fen, w, 
ff.view.DefaultNodeView(fen), PpContext(ppAct))
-#adaptor = ff.view.buoy.BuoyAdaptor()
-#adaptor.nodes = [ff.modules.pp.PPCanvasNode(fen, w, 
ff.view.DefaultNodeView(fen), PpContext(ppAct))] #, zzNodes.VanishingNodeType()]
-#adaptor.nodeLinkers = [ff.view.buoy.PPLinker(fen), scrollblockLinker]
-
-#scrollblockLinker.cellNodeType = adaptor
-
 
 # Now, before reading the xu stuff, render something 
 # to try to prevent NV driver
@@ -138,13 +106,13 @@
 # /BIG/PAPERART/ht/p16-furnas.pdf -- 
urn:x-storm:1.0:application/pdf,j4vb6u6cumtnstfusywhht3avhn2ujan.57hmjk7o7yqehac5mom3e3hvgckjq6xakx6o7qy
 
 if xulinks:
-    xuspace = fenfire.impl.ModularSpace(
-           fenfire.impl.SimpleVStreamTexter(
+    xuspace = ff.impl.ModularSpace(
+           ff.impl.SimpleVStreamTexter(
                    alph.impl.FakeSpanMaker(),
                    alph.impl.Enfilade1DImpl.Enfilade1DImplMaker()),
            model
        )
-    xuindexer = fenfire.index.IndexManager.getXuIndexer(xuspace)
+    xuindexer = ff.index.IndexManager.getXuIndexer(xuspace)
 
 
     pagescrolls = (
@@ -180,29 +148,29 @@
 
     if 1:
        xuindexer.add(XuLink(
-           
pagespanNodes.makeEnf(pagespans[0].subSpan(0,1).subArea(300,350,30,200)),
-           
pagespanNodes.makeEnf(pagespans[1].subSpan(0,1).subArea(220,250,370,240))
+           
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(
-           
pagespanNodes.makeEnf(pagespans[1].subSpan(1,2).subArea(0,300,350,300)),
-           
pagespanNodes.makeEnf(pagespans[0].subSpan(2,3).subArea(300,400,300,200)),
+           
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(
-           
pagespanNodes.makeEnf(pagespans[3].subSpan(1,2).subArea(0,200,350,200)),
-           
pagespanNodes.makeEnf(pagespans[0].subSpan(3,4).subArea(300,400,30,40)),
+           
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(
-           
pagespanNodes.makeEnf(pagespans[0].subSpan(1,2).subArea(20,40,332,220)),
-           
pagespanNodes.makeEnf(pagespans[4].subSpan(2,3).subArea(300,150,280,240)),
+           
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(
-           
pagespanNodes.makeEnf(pagespans[5].subSpan(1,2).subArea(0,240,350,200)),
-           
pagespanNodes.makeEnf(pagespans[0].subSpan(0,1).subArea(470,100,30,20)),
+           
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:
@@ -224,7 +192,7 @@
     ppAct.assocNotes(note1, 1, note2)
 
 #scrollblockLinker.xuIndex = xuindexer
-scrollblockLinker.xulinkPageSpanNodeType = 
pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
+scrollblockLinker.xulinkPageSpanNodeType = 
ff.view.buoy.pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
 
 # For now, no transclusions there
 #scrollblockLinker.transclusionPageSpanNodeType = None