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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/07 11:33:54

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

Log message:
        save with ctrl-q and loading when startting. fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.3 
fenfire/org/fenfire/bin/fenpdf10.py:1.4
--- fenfire/org/fenfire/bin/fenpdf10.py:1.3     Thu Aug  7 07:10:07 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Thu Aug  7 11:33:53 2003
@@ -87,6 +87,9 @@
 
 from org.fenfire.demo.fenpdfcontext import Context
 
+# save and load
+from com.hp.hpl.mesa.rdf.jena.mem import ModelMem
+import os.path
 
 import vob
 w.setCursor('wait')
@@ -98,22 +101,46 @@
 #ff.impl.SimpleNodeContent.dbg = 1
 
 
+DIR = 'myFenfire/'
+FILE = DIR+'mygraph.rdf'
+
+
+
 vob.putil.demo.usingNormalBindings = 0
 
 vob.buoy.buoymanager.replaceNewScene = vob.putil.demo.replacingScene
 vob.buoy.buoymanager.w = vob.putil.demo.w
 
-DIR = 'myFenfire/'
 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()
 
-# Create fen with swamps.
 
+# manual system to toggle the load point ;)
+# first time put 0 in here,
+# then Qtrl-Q for quit and save
+# then put load_toggle to 1 and rerun.
+do_load_graph = 0
+
+# automatic system for previous
+if os.path.isfile(FILE):
+    p('usin load function to have the the old graph back.')
+    do_load_graph = 1
+else:
+    do_load_graph = 0
+    p('better to make a new graph for you.')
+
+
+# Create fen with swamps.
 fen = ff.Fen()
-fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
+if do_load_graph:
+    m = ModelMem()
+    m.read(java.io.FileReader(FILE), None);
+    fen.constgraph = fen.graph = ff.swamp.Graphs.toGraph(m);
+else:
+    fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
 fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
 fen.txtfunc = fen.txt.getNodeFunction()
 fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
@@ -128,8 +155,9 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
-if 1:
-    paperA = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_1"
+paperA = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_1"
+paperHome = "urn:urn-5:COz-fSvNBZRieCdefRTKO2Mgcjmz:_1"
+if not do_load_graph:
     fen.graph.add(Nodes.get(paperA), RDF.type, CANVAS2D.Canvas);
     noteA1 = Nodes.get(ppAct.newNote(paperA, -30,-30, 'This is a test!'))
     noteA2 = Nodes.get(ppAct.newNote(paperA, -60,-70, 'This is a test2!'))
@@ -146,14 +174,13 @@
 
     ppAct.assocNotes(noteA1, 1, noteB1)
 
-    paperHome = "urn:urn-5:COz-fSvNBZRieCdefRTKO2Mgcjmz:_1"
     fen.graph.add(Nodes.get(paperHome), RDF.type, CANVAS2D.Canvas);
     noteHome = Nodes.get(ppAct.newNote(paperHome, 0, 0, 'HOME'))
 
     ppAct.assocNotes(noteHome, 1, noteA1)
 
 
-if 2:
+if not do_load_graph:
     #sc2 = myalph.addFile(java.io.File('testdata/paper.pdf'), 
'application/pdf')
 
     #noteH1 = Nodes.get(ppAct.newNote(paperHome, 200, 150, ''))
@@ -174,6 +201,8 @@
     ppAct.assocNotes(noteC1, 1, noteB3)
     ppAct.assocNotes(noteA4, 1, noteC2)
     
+it = fen.graph.findN_11X_Iter(paperA, ff.vocab.CANVAS2D.contains)
+noteA1 = it.next()
 
 spanImageFactory = ff.spanimages.gl.DefaultSpanImageFactory(
     ff.spanimages.gl.PageScrollBlockImager())
@@ -184,7 +213,6 @@
 dispnodeview = ff.view.DispatchingNodeView(fen.txtfunc,
                                            textnodeview,
                                            pagenodeview)
-#cached = ff.swamp.CachedNodeFunction(50, fen.constgraph, dispnodeview)
 nodeview = ff.view.lava.ContextNodeView(dispnodeview, fen.constgraph, 150)
 view = ff.view.CanvasView2D(fen, nodeview)
 view.cull = 1
@@ -204,6 +232,7 @@
 context.ppView = irregu
 context.pageView = None
 context.alph = myalph
+context.states.view2d.irregu = irregu
 ff.view.buoy.MainNode2D.fen = fen
 ff.view.buoy.AbstractMainNode2D.context = context
 
@@ -244,7 +273,7 @@
 # Transclusion
 tconnector = ff.view.buoy.TransclusionConnector(fen, nodeview)
 pagescroll2d = ff.view.PageScrollView2D(spanImageFactory)
-context.states.pageview = pagescroll2d
+context.states.view2d.pageview = pagescroll2d
 pagescroll2d = ff.view.AreaSelectingView2D(pagescroll2d)
 
 tconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu,
@@ -429,8 +458,12 @@
         elif key == "Home":
             self.mgr.singles[1].mainNode = ff.view.buoy.MainNode2D(planeHome, 
irregu, ctrl)
         elif key == "Ctrl-Q":
-            from java.lang import System
-            System.exit(43)
+            p("going to save");
+
+            m = ff.swamp.Graphs.toModel(fen.graph);
+            m.write(java.io.FileWriter(FILE));
+
+            java.lang.System.exit(43)
         elif key == "Ctrl-R":
             vob.putil.demo.loadScenes()
         #elif key == "?":
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.15 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.16
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.15      Wed Aug  6 12:25:20 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Thu Aug  7 11:33:54 2003
@@ -62,7 +62,7 @@
             self.states.spanImageFactory.paperMaker = self.makerTypes[0]
             self.makerTypes.append(self.makerTypes.pop(0))
             self.states.nodeview.reinit(fen.graph, 100)
-            self.states.pageview.flush()
+            self.states.view2d.pageview.flush()
 
         if stroke == 'Ctrl-A':
             p('Make an annotate.')
@@ -136,6 +136,13 @@
         # kludge to keep flag how BuoyViewMainNode.mouse() should return.
         # see AbstractMainNode2D.mouse()
         self.fastChg = 0
+
+        class Views:
+            def __init__(self):
+                self.irregu = None
+                self.pageview = None
+        self.view2d = Views()
+
 
     def chgCtrl(self):
         self.ctrl = not self.ctrl