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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/04 02:02:48

Modified files:
        org/fenfire/demo: buoyoing.py mind.py 
        org/fenfire/view: CanvasView2D.java 
        org/fenfire/view/buoy: AbstractMainNode2D.java 
                               TransclusionConnector.java 
Added files:
        org/fenfire/view/buoy/lava: MindMapConnector.java 
        org/fenfire/view/lava: __init__.py mindMapView2D.py 

Log message:
        mind mapping with fillets. looks funny

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mind.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/CanvasView2D.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/TransclusionConnector.java.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/lava/MindMapConnector.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py?rev=1.1

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.103 
fenfire/org/fenfire/demo/buoyoing.py:1.104
--- fenfire/org/fenfire/demo/buoyoing.py:1.103  Sat Aug  2 04:50:14 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Mon Aug  4 02:02:48 2003
@@ -116,6 +116,10 @@
     ppAct.assocNotes(noteHome, 1, noteA1)
 
 if 2:
+    fen.graph.add(noteA2, RDF.type, ff.vocab.lava.MINDSTRUCT.Data)
+
+
+if 2:
     #sc2 = myalph.addFile(java.io.File('testdata/paper.pdf'), 
'application/pdf')
 
     #noteH1 = Nodes.get(ppAct.newNote(paperHome, 200, 150, ''))
@@ -211,11 +215,21 @@
 #mainNode = ff.view.buoy.MainNode2D(plane, paperview, ctrl)
 
 
+### MindMap
+mmview = ff.view.lava.mindMapView2D.MindMapView2D(fen, nodeview)
+mmview = ff.view.AreaSelectingView2D(mmview)
+mmconnector = ff.view.buoy.lava.MindMapConnector(fen)
+mmconnector.normalNodeNodeType = ff.view.buoy.NodeType2D(irregu, \
+    ff.view.buoy.MainNode2D.MainNode2DFactory(1, ctrl))
+mmconnector.mindMapNodeType =  ff.view.buoy.NodeType2DFull(mmview, \
+    ff.view.buoy.MainNode2D.MainNode2DFactory(1, ctrl))
+
+
 ppconnector = ff.view.buoy.PPConnector(fen, irregu, 
                        ff.view.buoy.MainNode2D.MainNode2DFactory(1, ctrl),
                                        nodeview)
-tconnector = ff.view.buoy.TransclusionConnector(fen, nodeview)
 
+tconnector = ff.view.buoy.TransclusionConnector(fen, nodeview)
 #pagescroll2d = ff.view.IrregularViewportView2D(
 #          ff.view.PaperView2D(vob.putil.demowindow.w, 
 #                      ff.view.PageScrollView2D()))
@@ -444,12 +458,13 @@
         self.single = single
         if single:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode], [ppconnector, tconnector],
+               [mainNode], [ppconnector, mmconnector, tconnector],
                SingleGeometer(self, context, nodeview),
                 context=context)
         else:
             vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode, mainNode2], [ppconnector, tconnector],
+               [mainNode, mainNode2],
+                [ppconnector, mmconnector, tconnector],
                DoubleGeometer(self, context, nodeview),
                 context=context)
             
Index: fenfire/org/fenfire/demo/mind.py
diff -u fenfire/org/fenfire/demo/mind.py:1.2 
fenfire/org/fenfire/demo/mind.py:1.3
--- fenfire/org/fenfire/demo/mind.py:1.2        Tue Jul  1 12:33:33 2003
+++ fenfire/org/fenfire/demo/mind.py    Mon Aug  4 02:02:48 2003
@@ -113,7 +113,9 @@
     def mouse(self, ev):
         vs = self.vs
 
-        if ev.getID() == ev.MOUSE_CLICKED:
+        p('event', ev, 'modif', ev.getModifiersEx())
+
+        if ev.getType() == ev.MOUSE_CLICKED:
             print
             if ev.getModifiers() == ev.BUTTON3_MASK:
                 rotatelist(self.scumm)
Index: fenfire/org/fenfire/view/CanvasView2D.java
diff -u fenfire/org/fenfire/view/CanvasView2D.java:1.23 
fenfire/org/fenfire/view/CanvasView2D.java:1.24
--- fenfire/org/fenfire/view/CanvasView2D.java:1.23     Thu Jul 31 06:08:04 2003
+++ fenfire/org/fenfire/view/CanvasView2D.java  Mon Aug  4 02:02:48 2003
@@ -45,7 +45,7 @@
 /** A View2D of a CANVAS2D, with a given node function.
  */
 public class CanvasView2D extends View2D implements NodedView2D, 
org.fenfire.view.lava.FastView {
-public static final String rcsid = "$Id: CanvasView2D.java,v 1.23 2003/07/31 
10:08:04 mudyc Exp $";
+public static final String rcsid = "$Id: CanvasView2D.java,v 1.24 2003/08/04 
06:02:48 mudyc Exp $";
     public static boolean dbg = false;
     private static void p(String s) { System.out.println("CanvasView2D:: "+s); 
}
     
@@ -69,8 +69,6 @@
     }
 
 
-    private HashMap containers = new HashMap();
-
     public void render(VobScene vs, Object container,
                       int matchingParent, int box2screen, int box2plane)
     {
@@ -80,8 +78,6 @@
        int paper2box = vs.invertCS(box2plane, "canvasview_INv");
        int paper2screen = vs.concatCS(box2screen, "canvasview_conc",
                                    paper2box);
-       containers.put(""+box2screen, container);
-
        if (dbg) {
            p("canvas container: "+container);
            p("box2screen: "+box2screen);
Index: fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.37 
fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.38
--- fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java:1.37  Sat Aug  2 
04:21:47 2003
+++ fenfire/org/fenfire/view/buoy/AbstractMainNode2D.java       Mon Aug  4 
02:02:48 2003
@@ -132,7 +132,6 @@
         // inherited classes will render before this.
        if (context != null)
            context.mainNodeToBeRender(vs, into, this);
-
     }
     public interface Render {
        void mainNodeToBeRender(VobScene vs, int into,
Index: fenfire/org/fenfire/view/buoy/TransclusionConnector.java
diff -u fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.20 
fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.21
--- fenfire/org/fenfire/view/buoy/TransclusionConnector.java:1.20       Thu Jul 
31 07:39:10 2003
+++ fenfire/org/fenfire/view/buoy/TransclusionConnector.java    Mon Aug  4 
02:02:48 2003
@@ -44,7 +44,7 @@
 /** Hang transclusion buoys.
  */
 public class TransclusionConnector implements BuoyViewConnector {
-public static final String rcsid = "$Id: TransclusionConnector.java,v 1.20 
2003/07/31 11:39:10 mudyc Exp $";
+public static final String rcsid = "$Id: TransclusionConnector.java,v 1.21 
2003/08/04 06:02:48 mudyc Exp $";
     public static boolean dbg = false;
     private static void p(String s) { 
System.out.println("TransclusionConnector:: "+s); }
 
@@ -56,7 +56,7 @@
 
     protected NodeFunction nodeView;
 
-    // Function: node -> pair(scrollblock, rect)
+    // Function: node -> pair(scrollblock, View2D.Anchor)
     private class SB4Node implements NodeFunction {
        public Object f(ConstGraph g, Object node) {
            Enfilade1D enf = (Enfilade1D)fen.txtfunc.f(g, node);
@@ -79,7 +79,6 @@
            for(int i=0; i<sp.getPageIndex(); i++)
                x += b.getPage(i).getSize().width;
 
-           //      return new Pair(b, new Pair(new Rectangle(x,y,w,h), null));
            return new View2D.Anchor(b, x,y,w,h, null);
        }
     }