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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/14 05:58:15

Modified files:
        org/fenfire/bin: fenpdf10.py 

Log message:
        Find home through Treetime

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.35 
fenfire/org/fenfire/bin/fenpdf10.py:1.36
--- fenfire/org/fenfire/bin/fenpdf10.py:1.35    Thu Aug 14 05:52:48 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug 14 05:58:14 2003
@@ -67,7 +67,7 @@
 
 from org import fenfire as ff
 from org.fenfire.swamp import Nodes
-from org.fenfire.vocab import RDF, CANVAS2D
+from org.fenfire.vocab import RDF, CANVAS2D, TREETIME
 from org.fenfire.index import XuLink
 from org.fenfire.util import Pair
 
@@ -137,7 +137,7 @@
 fen.alph = myalph
 
 ppActions = ff.modules.pp.PPActionsImpl(fen)
-treetime = ff.structure.TreeTime(ff.vocab.TREETIME.follows)
+treetime = ff.structure.TreeTime(TREETIME.follows)
 ppActions.treeTime = treetime
 
 # Now, before reading the xu stuff, render something 
@@ -149,9 +149,7 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
-
-paperHome = "urn:urn-5:COz-fSvNBZRieCdefRTKO2Mgcjmz:_1"
-
+# If we want a new space, create a demo space.
 if not do_load_graph:
     ff.fenpdf.demospace.createDemoSpace(fen, myalph, treetime, ppActions)
 
@@ -233,8 +231,21 @@
 
 
 
+#
+# The first plane is the "firstOf" of the TREETIME follows 
+# relation. 
+# XXX Should also check type.
+#
+iter = fen.constgraph.findN_X11_Iter(TREETIME.currentOf, TREETIME.follows)
+planeHome = iter.next()
+if planeHome == None: 
+    print "Error: home plane not found"
+    exit(42)
+if not ppActions.isPaper(planeHome):
+    print "Error: home plane not found - wrong type ", planeHome
+    exit(42)
+
 
-planeHome = Nodes.get(paperHome)
 
 mainNode = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
 mainNode2 = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
@@ -256,7 +267,7 @@
     ff.view.buoy.FisheyeMainNode2D.FisheyeMainNode2DFactory(mainMouse))
 
 # Treetime
-ttconnector = ff.view.buoy.TTConnector(fen, ff.vocab.TREETIME.follows)
+ttconnector = ff.view.buoy.TTConnector(fen, TREETIME.follows)
 ttconnector.normalNodeNodeType = tconnector.normalNodeNodeType
 ttconnector.pageImageScrollNodeType = tconnector.pageImageScrollNodeType