[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/05/23 11:02:53

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

Log message:
        shifting for buoys

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPConnector.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.55 
fenfire/org/fenfire/demo/buoyoing.py:1.56
--- fenfire/org/fenfire/demo/buoyoing.py:1.55   Fri May 23 10:26:07 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri May 23 11:02:53 2003
@@ -59,8 +59,8 @@
 
 DIR = 'myFenfire'
 os.system('mkdir -p '+DIR)
-# pool = storm.impl.TransientPool(java.util.HashSet())
-pool = storm.impl.DirPool(java.io.File(DIR), java.util.HashSet())
+pool = storm.impl.TransientPool(java.util.HashSet())
+# 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()
Index: fenfire/org/fenfire/view/buoy/PPConnector.java
diff -u fenfire/org/fenfire/view/buoy/PPConnector.java:1.11 
fenfire/org/fenfire/view/buoy/PPConnector.java:1.12
--- fenfire/org/fenfire/view/buoy/PPConnector.java:1.11 Fri May 23 10:26:08 2003
+++ fenfire/org/fenfire/view/buoy/PPConnector.java      Fri May 23 11: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.11 2003/05/23 
14:26:08 mudyc Exp $";
+public static final String rcsid = "$Id: PPConnector.java,v 1.12 2003/05/23 
15:02:53 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPConnector::"+s); }
 
@@ -64,6 +64,7 @@
            /* check all associations */
 
            // Right links!
+            int shift = 0;
            Iterator iter = fen.constgraph.findN_11X_Iter(node, 
                    STRUCTLINK.linkedTo);
            while (iter.hasNext()) {
@@ -71,17 +72,20 @@
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
                Pair anchor = new Pair(plane, getRect(obj));
                if (dbg) pa("rect:"+getRect(obj));
-               l.link(1, cs, nodeType, new Pair(node, obj), anchor);
+               l.link(1, cs, nodeType, new Pair(node, obj), anchor, shift);
+                shift++;
            }
 
            // Left links!
+            shift = 0;
            iter = fen.constgraph.findN_X11_Iter(STRUCTLINK.linkedTo, node);
            while (iter.hasNext()) {
                Object obj = iter.next();
                Object plane = fen.constgraph.find1_X11(CANVAS2D.contains, obj);
                Pair anchor = new Pair(plane, getRect(obj));
                if (dbg) pa("rect:"+getRect(obj));
-               l.link(-1, cs, nodeType, new Pair(obj, node), anchor);
+               l.link(-1, cs, nodeType, new Pair(obj, node), anchor, shift);
+                shift++;
            }
        }
     }