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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/11 08:12:19

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/view/buoy: TTConnector.java 

Log message:
        More TTConnector work - right now it crashes due to negative anchor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TTConnector.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.14 
fenfire/org/fenfire/bin/fenpdf10.py:1.15
--- fenfire/org/fenfire/bin/fenpdf10.py:1.14    Mon Aug 11 08:07:31 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Mon Aug 11 08:12:19 2003
@@ -135,6 +135,7 @@
 fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
 fen.txtfunc = fen.txt.getNodeFunction()
 fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
+fen.alph = myalph
 
 ppAct = ff.modules.pp.PPActionsImpl(fen)
 treetime = ff.structure.TreeTime(ff.vocab.TREETIME.follows)
@@ -153,9 +154,18 @@
 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, ''))
@@ -168,13 +178,11 @@
     span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
     fen.txt.set(noteA3, enfMaker.makeEnfilade(span))
 
-    paperB = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_2"
-    fen.graph.add(Nodes.get(paperB), RDF.type, CANVAS2D.Canvas);
+
     noteB1 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another 
test!'))
 
     ppAct.assocNotes(noteA1, 1, noteB1)
 
-    fen.graph.add(Nodes.get(paperHome), RDF.type, CANVAS2D.Canvas);
     noteHome = Nodes.get(ppAct.newNote(paperHome, 0, 0, 'HOME'))
 
     ppAct.assocNotes(noteHome, 1, noteA1)
@@ -191,8 +199,6 @@
     #span = sc2.getCurrent().getPage(0).subArea(30, 150, 270, 200);
     #fen.txt.set(noteH1, enfMaker.makeEnfilade(span))
 
-    paperC = "urn:urn-5:P7OMBN+yp3-m-AkulZN-NeaJV9Sl:_5"
-    fen.graph.add(Nodes.get(paperC), RDF.type, CANVAS2D.Canvas);
     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'))
@@ -305,6 +311,12 @@
 
 # Treetime
 ttconnector = ff.view.buoy.TTConnector(fen, ff.vocab.TREETIME.follows)
+ttconnector.normalNodeNodeType = tconnector.normalNodeNodeType
+ttconnector.pageImageScrollNodeType = tconnector.pageImageScrollNodeType
+
+
+# connectors = [ppconnector, tconnector, ttconnector]
+connectors = [ppconnector, tconnector]
 
 class DoubleGeometer:
     def __init__(self, mgr, context, nodeview):
@@ -479,12 +491,11 @@
         self.single = single
         if single:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode], [ppconnector, tconnector, ttconnector],
+               [mainNode], connectors,
                SingleGeometer(self, context, nodeview))
         else:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode, mainNode2],
-                [ppconnector, tconnector, ttconnector],
+               [mainNode, mainNode2], connectors,
                DoubleGeometer(self, context, nodeview))
             
         w.setCursor('default')
Index: fenfire/org/fenfire/view/buoy/TTConnector.java
diff -u fenfire/org/fenfire/view/buoy/TTConnector.java:1.2 
fenfire/org/fenfire/view/buoy/TTConnector.java:1.3
--- fenfire/org/fenfire/view/buoy/TTConnector.java:1.2  Mon Aug 11 07:07:27 2003
+++ fenfire/org/fenfire/view/buoy/TTConnector.java      Mon Aug 11 08:12:19 2003
@@ -25,6 +25,8 @@
     private Fen fen;
     private Object relation;
 
+    private Object key = "TTConnection";
+
     public AbstractNodeType2D pageImageScrollNodeType;
     public AbstractNodeType2D normalNodeNodeType;
 
@@ -33,15 +35,27 @@
        this.relation = relation;
     }
 
-    private void addBuoy(VobScene vs, Object node, int direction,
+
+    private void addBuoy(VobScene vs, Object linkId,
+                       Object node, int direction,
+                       int index,
                        BuoyLinkListener l) {
        String s = Nodes.toString(node);
+       Object plane;
+       BuoyViewNodeType nodeType;
        if(s.startsWith("urn:x-storm:1.0:application/pdf") ||
           s.startsWith("urn:x-storm:1.0:application/postscript")) {
            if(dbg) p("Got "+s+" was pagescroll " + direction);
+           plane = fen.alph.getScrollBlock(s);
+           nodeType = pageImageScrollNodeType;
        } else {
            if(dbg) p("Got "+s+" was plane " + direction);
+           plane = node;
+           nodeType = normalNodeNodeType;
        }
+       View2D.Anchor anchor = new View2D.Anchor(
+                   plane,  0, 0, 0, 0, null);
+       l.link(direction, -1, nodeType, linkId, anchor, index);
     }
 
     public void addBuoys(VobScene vs, int parentCs,
@@ -66,19 +80,28 @@
            node = plane;
        }
 
+       int index = 0;
+
        for(
            Iterator ileft = fen.constgraph.findN_11X_Iter(node, relation);
            ileft.hasNext();) {
            Object linknode = ileft.next();
-           addBuoy(vs, linknode, -1, l);
+           addBuoy(vs, 
+               new Triple(this.key, node, linknode),
+               linknode, -1, index, l);
+           index++;
        }
        
+       index = 0;
 
        for(
            Iterator iright = fen.constgraph.findN_X11_Iter(relation, node);
            iright.hasNext();) {
            Object linknode = iright.next();
-           addBuoy(vs, linknode, 1, l);
+           addBuoy(vs, 
+               new Triple(this.key, node, linknode),
+                   linknode, 1, index, l);
+           index++;
        }