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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/10 09:02:53

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

Log message:
        Connections on same canvas shown as lines on that canvas

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.70 
fenfire/org/fenfire/demo/buoyoing.py:1.71
--- fenfire/org/fenfire/demo/buoyoing.py:1.70   Mon Jun  9 18:45:36 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Tue Jun 10 09:02:52 2003
@@ -95,6 +95,8 @@
     noteA2 = Nodes.get(ppAct.newNote(paperA, -60,-70, 'This is a test2!'))
     noteA3 = Nodes.get(ppAct.newNote(paperA, 100, 100, ''))
 
+    ppAct.assocNotes(noteA1, 1, noteA2);
+
     span = sc.getCurrent().getPage(0).subArea(100, 100, 300, 200);
     fen.txt.set(noteA3, enfMaker.makeEnfilade(span))
 
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.16 
fenfire/org/fenfire/view/CanvasView2D.java:1.17
--- fenfire/org/fenfire/view/CanvasView2D.java:1.16     Fri May 23 10:26:08 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Tue Jun 10 09:02:53 2003
@@ -12,6 +12,7 @@
 import org.nongnu.libvob.gl.*;
 import org.nongnu.libvob.impl.gl.*;
 import org.nongnu.libvob.buoy.*;
+import org.nongnu.libvob.vobs.SimpleConnection;
 import org.nongnu.libvob.lava.placeable.Placeable;
 import org.nongnu.alph.*;
 
@@ -20,7 +21,7 @@
 /** A View2D of a CANVAS2D, with a given node function.
  */
 public class CanvasView2D extends View2D implements NodedView2D{
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.16 2003/05/23 
14:26:08 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.17 2003/06/10 
13:02:53 benja Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("CanvasView2D::"+s); 
}
     
@@ -28,9 +29,19 @@
     private NodeFunction nodeView;
     public boolean cull;
 
+    protected SimpleConnection lineconn = new SimpleConnection(.5f, .5f, .5f, 
.5f);
+
     public CanvasView2D(Fen fen, NodeFunction nodeView) {
        this.fen = fen;
        this.nodeView = nodeView;
+       lineconn.glsetup = GLCache.getCallList(
+           "PushAttrib ENABLE_BIT LINE_BIT\n"+
+           "Disable TEXTURE_2D\n"+
+           "LineWidth 5\n" +
+           "Enable BLEND\n" +
+           "Color 0 0 0 0.6\n"
+       );
+       lineconn.glteardown = GLCache.getCallList("PopAttrib");
     }
 
     public void render(VobScene vs, Object container,
@@ -69,6 +80,28 @@
                cs = vs.cullCS(cs, "CULL", box2screen);
            }
            p.place(vs, cs);
+       }
+
+       // show connections
+       Iterator iter1 = fen.constgraph.findN_11X_Iter(container, 
+                                                     CANVAS2D.contains);
+       while (iter1.hasNext()) {
+           Object node1 = iter1.next();
+           Pair key1 = new Pair(container, node1);
+           int cs1 = vs.matcher.getCS(matchingParent, key1);
+
+           Iterator iter2 = fen.constgraph.findN_11X_Iter(node1, 
+                   STRUCTLINK.linkedTo);
+           while (iter2.hasNext()) {
+               Object node2 = iter2.next();
+               Object container2 = fen.constgraph.find1_X11(CANVAS2D.contains, 
node2);
+               if(container2 != container)
+                   continue;
+               Pair key2 = new Pair(container, node2);
+               int cs2 = vs.matcher.getCS(matchingParent, key2);
+               
+               vs.map.put(lineconn, cs1, cs2);
+           }
        }
 
        if (dbg) pa("Canvas DONE");
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.12 
fenfire/org/fenfire/view/buoy/PPConnector.java:1.13
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.12 Fri May 23 11:02:53 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java      Tue Jun 10 09:02:53 2003
@@ -17,7 +17,7 @@
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: PPConnector.java,v 1.12 2003/05/23 
15:02:53 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.13 2003/06/10 
13:02:53 benja Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPConnector::"+s); }
 
@@ -70,6 +70,7 @@
            while (iter.hasNext()) {
                Object obj = iter.next();
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
+               if (container == plane) continue;
                Pair anchor = new Pair(plane, getRect(obj));
                if (dbg) pa("rect:"+getRect(obj));
                l.link(1, cs, nodeType, new Pair(node, obj), anchor, shift);
@@ -82,6 +83,7 @@
            while (iter.hasNext()) {
                Object obj = iter.next();
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
+               if (container == plane) continue;
                Pair anchor = new Pair(plane, getRect(obj));
                if (dbg) pa("rect:"+getRect(obj));
                l.link(-1, cs, nodeType, new Pair(obj, node), anchor, shift);