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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/16 05:18:36

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view/buoy: PPLinker.java 

Log message:
        twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.10 
fenfire/org/fenfire/demo/buoyoing.py:1.11
--- fenfire/org/fenfire/demo/buoyoing.py:1.10   Wed Apr 16 05:03:42 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Wed Apr 16 05:18:36 2003
@@ -93,10 +93,11 @@
 
 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):
+    def __init__(self, ppAc):
         self.cursor = None
-        self.ppAct = ff.modules.pp.PPActionsImpl(fen)
+        self.ppAct = ppAc
     def nodeIsToBePlaced(self, node, nv):
         print 'view context is not implemented'
     def getAccursed(self):
@@ -111,16 +112,9 @@
             paper = fen.constgraph.find1_X11(getAccursed(), PP.contains);
         return paper.toString();
 
-print 'FOOO'
-
-a = ff.swamp.Nodes.N()
-b = ff.swamp.Nodes.N()
-c = ff.swamp.Nodes.N()
-
-fen.graph.add(a,b,c)
     
 adaptor = ff.view.buoy.BuoyAdaptor()
-adaptor.nodes = [ff.modules.pp.PPCanvasNode(fen, w, 
ff.view.DefaultNodeView(fen), PpContext())] #, zzNodes.VanishingNodeType()]
+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
@@ -135,9 +129,9 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
-xulinks = 1
+xulinks = 0
 
-canvases = 0
+canvases = 1
 
 # /BIG/PAPERART/ht/p16-furnas.pdf -- 
urn:x-storm:1.0:application/pdf,j4vb6u6cumtnstfusywhht3avhn2ujan.57hmjk7o7yqehac5mom3e3hvgckjq6xakx6o7qy
 
@@ -214,40 +208,17 @@
     global linkid1
 
     # try out some notes..
-    pg0 = pagescrolls[0]
+    #pg0 = pagescrolls[0]
 
-    wholepage = pg0.getCurrent().subSpan(0,1)
-    span = wholepage.subArea(70, 50, 400, 100)
-    paper = newPaper()
-    linkid1 = addTrans(span, paper)
-    addNote(paper, 'NOTES:', -40, -20)
-    addNote(paper, '- graph of local hypertext structure', -42, 0)
-    addNote(paper, '- visualization', -43, 20)
-    addNote(paper, '- good', -39, 37)
-
-    paper = newPaper()
-    span = wholepage.subArea(222, 250, 170, 50)
-    addTrans(span, paper)
-    addNote(paper, 'Iblam blla et laa',-30,-70)
-    addNote(paper, 'Foo et all laawd oone of gheese', -50, -45)
-
-    paper = newPaper()
-    wholepage = pg0.getCurrent().subSpan(4,5)
-    span = wholepage.subArea(300, 180, 280, 38)
-    addTrans(span, paper)
-    addNote(paper, 'The problem is well explained over here!', 0, -30)
-
-    paper = newPaper()
-    wholepage = pg0.getCurrent().subSpan(3,4)
-    span = wholepage.subArea(315, 385, 270, 110)
-    addTrans(span, paper)
-    addNote(paper, 'Well, this is a good point', -100, -187)
-    addNote(paper, 'hmmm.... how about buoys?', -20, -31)
-    addNote(paper, 'NOTE: Need to start discussing about this\n      on 
mailing list of our project..', -110)
+    #wholepage = pg0.getCurrent().subSpan(0,1)
+    #span = wholepage.subArea(70, 50, 400, 100)
+    paper = ppAct.newPaper()
+    ppAct.newNote(paper, 0,0, 'This is a test!')
+    #linkid1 = addTrans(span, paper)
 
 
 
-scrollblockLinker.xuIndex = xuindexer
+#scrollblockLinker.xuIndex = xuindexer
 scrollblockLinker.xulinkPageSpanNodeType = 
pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
 
 # For now, no transclusions there
Index: fenfire/org/fenfire/view/buoy/PPLinker.java
diff -u fenfire/org/fenfire/view/buoy/PPLinker.java:1.5 
fenfire/org/fenfire/view/buoy/PPLinker.java:1.6
--- fenfire/org/fenfire/view/buoy/PPLinker.java:1.5     Wed Apr 16 01:36:12 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.java Wed Apr 16 05:18:36 2003
@@ -1,6 +1,6 @@
 //(c): Matti Katila
 
-package org.fenfire.modules.pp;
+package org.fenfire.view.buoy;
 import org.fenfire.*;
 import org.fenfire.swamp.*;
 import org.fenfire.view.buoy.*;
@@ -14,7 +14,7 @@
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPLinker implements BuoyNodeViewLinker {
-public static final String rcsid = "$Id: PPLinker.java,v 1.5 2003/04/16 
05:36:12 mudyc Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.6 2003/04/16 
09:18:36 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }