[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py fenpdf/fenp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/14 04:00:17

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/fenpdf: fenpdfcontext.py 
Added files:
        org/fenfire/fenpdf: demospace.py 

Log message:
        Move creation of demo space out of fenpdf10.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/demospace.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.32 
fenfire/org/fenfire/bin/fenpdf10.py:1.33
--- fenfire/org/fenfire/bin/fenpdf10.py:1.32    Thu Aug 14 03:50:58 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 14 04:00:17 2003
@@ -106,8 +106,6 @@
 os.system('mkdir -p '+DIR)
 pool = storm.impl.DirPool(java.io.File(DIR), 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()
 
 
 # manual system to toggle the load point ;)
@@ -138,9 +136,9 @@
 fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
 fen.alph = myalph
 
-ppAct = ff.modules.pp.PPActionsImpl(fen)
+ppActions = ff.modules.pp.PPActionsImpl(fen)
 treetime = ff.structure.TreeTime(ff.vocab.TREETIME.follows)
-ppAct.treeTime = treetime
+ppActions.treeTime = treetime
 
 # Now, before reading the xu stuff, render something 
 # to try to prevent NV driver
@@ -154,58 +152,9 @@
 
 paperA = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_1"
 paperHome = "urn:urn-5:COz-fSvNBZRieCdefRTKO2Mgcjmz:_1"
-if not do_load_graph:
-    paperB = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_2"
-    paperC = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_5"
-    fen.graph.add(Nodes.get(paperHome), RDF.type, CANVAS2D.Canvas);
-    fen.graph.add(Nodes.get(paperA), RDF.type, CANVAS2D.Canvas);
-    fen.graph.add(Nodes.get(paperB), RDF.type, CANVAS2D.Canvas);
-    fen.graph.add(Nodes.get(paperC), RDF.type, CANVAS2D.Canvas);
-    treetime.addLatest(fen.graph, Nodes.get(paperHome))
-    treetime.addLatest(fen.graph, Nodes.get(sc.getID()))
-    treetime.addLatest(fen.graph, Nodes.get(paperA))
-    treetime.addLatest(fen.graph, Nodes.get(paperB))
-    treetime.addLatest(fen.graph, Nodes.get(paperC))
-
-    noteA1 = Nodes.get(ppAct.newNote(paperA, -30,-30, 'This is a test!'))
-    noteA2 = Nodes.get(ppAct.newNote(paperA, -60,-70, 'This is a test2!'))
-    noteA3 = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
-    noteA4 = Nodes.get(ppAct.newNote(paperA, -60,70, 'This is a very long test 
which is used to see if '))
-
-    fen.graph.add(noteA2, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
-
-    ppAct.assocNotes(noteA1, 1, noteA2);
-
-    span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
-    fen.txt.set(noteA3, enfMaker.makeEnfilade(span))
-
-
-    noteB1 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another 
test!'))
 
-    ppAct.assocNotes(noteA1, 1, noteB1)
-
-    noteHome = Nodes.get(ppAct.newNote(paperHome, 0, 0, 'HOME'))
-
-    ppAct.assocNotes(noteHome, 1, noteA1)
-
-    #sc2 = myalph.addFile(java.io.File('testdata/paper.pdf'), 
'application/pdf')
-
-    #noteH1 = Nodes.get(ppAct.newNote(paperHome, 200, 150, ''))
-    noteH2 = Nodes.get(ppAct.newNote(paperHome, -400, 0, 'foobar'))
-    noteB2 = Nodes.get(ppAct.newNote(paperB, 1200, 300, 'This is yet another 
test!'))
-    ppAct.assocNotes(noteB2, 1, noteH2)
-
-    #span = sc2.getCurrent().getPage(0).subArea(30, 150, 270, 200);
-    #fen.txt.set(noteH1, enfMaker.makeEnfilade(span))
-
-    noteC1 = Nodes.get(ppAct.newNote(paperC, 0, 0, 'baz'))
-    noteC2 = Nodes.get(ppAct.newNote(paperC, -200, 50, 'bar'))
-    noteB3 = Nodes.get(ppAct.newNote(paperB, 1150, 600, 'foo'))
-    noteA4 = Nodes.get(ppAct.newNote(paperA, -100, -200, 'Lorem ipsum dolor'))
-    
-    ppAct.assocNotes(noteC1, 1, noteB3)
-    ppAct.assocNotes(noteA4, 1, noteC2)
-    
+if not do_load_graph:
+    ff.fenpdf.demospace.createDemoSpace(fen, myalph, treetime, ppActions)
 
 spanImageFactory = ff.spanimages.gl.DefaultSpanImageFactory(
     ff.spanimages.gl.PageScrollBlockImager())
@@ -227,7 +176,7 @@
 ff.view.buoy.NodeType2DFull.effigy = 0
 
 
-context = Context(w, fen, ppAct, nodeview, spanImageFactory)
+context = Context(w, fen, ppActions, nodeview, spanImageFactory)
 nodeview.setContext(context)
 textnodeview.setContext(context)
 
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.1 
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.2
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.1     Thu Aug 14 03:50:58 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Thu Aug 14 04:00:17 2003
@@ -1,4 +1,4 @@
-# (c): Matti J. Katila
+# (c): Matti J. Katila and Tuomas J. Lukka
 
 from org import fenfire as ff
 from org.fenfire.swamp import Nodes