[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMGeometry...
From: |
Asko Soukka |
Subject: |
[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMGeometry... |
Date: |
Mon, 25 Aug 2003 18:38:31 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Asko Soukka <address@hidden> 03/08/25 18:38:31
Modified files:
org/fenfire/demo: mm.py
org/fenfire/fenmm: MMGeometry.java
org/fenfire/view/lava: mindMapView2D.py
Log message:
tuning geometry, unfortunately usable maximum depth seems to be only 3
:(
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMGeometry.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.39 fenfire/org/fenfire/demo/mm.py:1.40
--- fenfire/org/fenfire/demo/mm.py:1.39 Mon Aug 25 16:45:46 2003
+++ fenfire/org/fenfire/demo/mm.py Mon Aug 25 18:38:30 2003
@@ -330,9 +330,9 @@
self.view,
self.mindMouse)
self.context.main = self.main
dimensions = w.getSize()
- self.view.filletLength = dimensions.width * 1./4.
- self.view.filletWidth = dimensions.height * 1./15.
- self.view.depth = 5
+ self.view.filletLength = dimensions.width * 1./4
+ self.view.filletWidth = dimensions.height * 1./15
+ self.view.depth = 3
# flag for cursor('wait')
self.startup = 1
Index: fenfire/org/fenfire/fenmm/MMGeometry.java
diff -u fenfire/org/fenfire/fenmm/MMGeometry.java:1.3
fenfire/org/fenfire/fenmm/MMGeometry.java:1.4
--- fenfire/org/fenfire/fenmm/MMGeometry.java:1.3 Mon Aug 25 16:11:40 2003
+++ fenfire/org/fenfire/fenmm/MMGeometry.java Mon Aug 25 18:38:30 2003
@@ -15,8 +15,12 @@
public static final String rcsid = "$Id:";
private final static int INITIAL_CAPACITY = 10;
- public static double getScale(int depth) { return
1-(Math.log((depth+1))/Math.E); }
+ public static double getScaleLength(int depth) {
+ if (depth <= 0) return 1.0;
+ return (Math.log(depth)*(-1)+Math.E)*(1/(2*Math.E));
+ }
public static double getTextScale(int depth) { return
1-(Math.log(depth+1)/Math.E)/2; }
+ public static double getScale(int depth) { return
1-(Math.log(depth+1)/Math.E); }
private ConstGraph g;
private int maxDepth;
@@ -43,7 +47,7 @@
int depth, double[] xyOut) {
if (depth == 0 || xyOut.length < 2) return;
- double r = filletLength * getScale(depth);
+ double r = filletLength * getScaleLength(depth-1);
xyOut[0] = x0 + Math.sin(angle) * r;
xyOut[1] = y0 + Math.cos(angle) * r;
}
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.41
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.42
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.41 Mon Aug 25 16:11:40 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py Mon Aug 25 18:38:30 2003
@@ -56,11 +56,11 @@
self.multiplexer = ff.swamp.MultiplexerNodeFunction(normal, accursed)
self.floatingView = MindMapView2D(fen, context)
- self.floatingView.filletLength = 40
+ self.floatingView.filletLength = 30
self.floatingView.filletWidth = 10
self.floatingView.initRotation = 0
self.floatingView.depth = 2
- self.floatingView.geometry.init(40, 10, 0, 2)
+ self.floatingView.geometry.init(30, 10, 0, 2)
def renderMain(self, vs, into):
ff.view.buoy.MainNode2D.renderMain(self, vs, into)