[ff-cvs] fenfire/org/fenfire fenmm/MMGeometry.java view/...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/25 19:11:37

Modified files:
        org/fenfire/fenmm: MMGeometry.java 
        org/fenfire/view/lava: mindMapView2D.py 

Log message:
        stubs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMGeometry.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/fenmm/MMGeometry.java
diff -u fenfire/org/fenfire/fenmm/MMGeometry.java:1.5 
fenfire/org/fenfire/fenmm/MMGeometry.java:1.6
--- fenfire/org/fenfire/fenmm/MMGeometry.java:1.5       Mon Aug 25 19:01:57 2003
+++ fenfire/org/fenfire/fenmm/MMGeometry.java   Mon Aug 25 19:11:37 2003
@@ -60,6 +60,7 @@
        double y = xy[1];
 
         double s = filletWidth * getScale(depth);
+       if (depth == maxDepth) s = 0;
 
        int cs = vs.orthoBoxCS(into, new Pair("MMNode", node), depth,
                               (float)(x - s/2f), (float)(y - s/2f),
@@ -154,13 +155,11 @@
           if (net.hasBeenLinked(centerNode, link)) continue;
           net.link(centerNode, link);
           
-          if (beginDepth < maxDepth) {
-              if (net.getPlace(link) == null) {
-                  MMPlace pl = getPlace(vs, into, x, y, link,
-                                        startAngle+rotationAngle*i,
-                                        beginDepth);
-                  net.put(link, pl, beginDepth);
-              }
+          if (net.getPlace(link) == null) {
+              MMPlace pl = getPlace(vs, into, x, y, link,
+                                    startAngle+rotationAngle*i,
+                                    beginDepth);
+              net.put(link, pl, beginDepth);
           }
        }
 
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.42 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.43
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.42 Mon Aug 25 18:38:30 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Mon Aug 25 19:11:37 2003
@@ -230,7 +230,10 @@
             # draw text etc..
             cs = vs.coords.translate(pl.cs, 0,0, -100)
             vs.matcher.add(self.matchingParent, cs, node)
-            self.putNodeContent(vs, node, cs)
+
+            depth = self.net.getDepth(node)
+            if depth < self.depth:
+                self.putNodeContent(vs, node, cs)
 
     def putNodeContent(self, vs, node, into):
         # scaling after depth