[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMTextCurs...
From: |
Asko Soukka |
Subject: |
[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMTextCurs... |
Date: |
Tue, 26 Aug 2003 05:40:36 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Asko Soukka <address@hidden> 03/08/26 05:40:36
Modified files:
org/fenfire/demo: mm.py
org/fenfire/fenmm: MMTextCursor.java
org/fenfire/view/lava: mindMapView2D.py
Log message:
floating geometry
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMTextCursor.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.43&tr2=1.44&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.40 fenfire/org/fenfire/demo/mm.py:1.41
--- fenfire/org/fenfire/demo/mm.py:1.40 Mon Aug 25 18:38:30 2003
+++ fenfire/org/fenfire/demo/mm.py Tue Aug 26 05:40:35 2003
@@ -396,7 +396,7 @@
if hasattr(self.view, "zoomPanCS"):
self.context.c.render(vs, cs, self.view.zoomPanCS,
nodeview.f(fen.graph, accursed))
else: self.context.c.render(vs, cs, nodeview.f(fen.graph,
accursed))
- else: self.context.c.render(vs, 0, nodeview.f(fen.graph, accursed))
+ else: self.context.c.render(vs, cs, nodeview.f(fen.graph,
accursed))
if self.startup: w.setCursor('default'); self.startup = 0
Index: fenfire/org/fenfire/fenmm/MMTextCursor.java
diff -u fenfire/org/fenfire/fenmm/MMTextCursor.java:1.3
fenfire/org/fenfire/fenmm/MMTextCursor.java:1.4
--- fenfire/org/fenfire/fenmm/MMTextCursor.java:1.3 Mon Aug 25 10:20:03 2003
+++ fenfire/org/fenfire/fenmm/MMTextCursor.java Tue Aug 26 05:40:36 2003
@@ -46,16 +46,6 @@
public void setAccursed(Object node) { accursed = node; offset = 0; }
- /** unnecessary
- public HashSet setAccursed(Object node, MultiplexerNodeFunction
multiplexer) {
- HashSet set = new HashSet();
- set.add(node);
- setAccursed(node);
- if (multiplexer != null) multiplexer.setMultiplexerNodes(set);
- return set;
- }
- */
-
public Object getAccursed() { return accursed; }
public int setOffset(int offset) { this.offset = offset; return
this.offset; }
public int setOffset(float x, float y) throws NotYetRenderedException {
@@ -155,7 +145,8 @@
1, -style.getHeight(scale));
vs.matcher.add(matchCS, cursorCS, "CURSOR");
} else {
- nodeCS = vs.matcher.getCS(accursed);
+ if (matchCS > 0) nodeCS = vs.matcher.getCS(matchCS, accursed);
+ else nodeCS = vs.matcher.getCS(accursed);
float nodeXY[] = {0f, 0f, 0f};
vs.coords.transformPoints3(nodeCS, nodeXY, nodeXY);
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.43
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.44
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.43 Mon Aug 25 19:11:37 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py Tue Aug 26 05:40:36 2003
@@ -65,6 +65,7 @@
def renderMain(self, vs, into):
ff.view.buoy.MainNode2D.renderMain(self, vs, into)
self.context.floatingHash = java.util.HashMap()
+ self.floatingView.matchingParent = into
accursed = self.context.c.getAccursed()
# adding accursed to multiplexer
@@ -83,13 +84,12 @@
buffer.append(obj)
buffer.extend(self.context.components)
- floating = self.floatingBuffer(vs, buffer)
+ floating = self.floatingBuffer(vs, into, buffer)
i = floating.keySet().iterator()
while i.hasNext():
node = i.next()
if self.structLink.isLinked(node):
- self.floatingView.matchingParent = into
self.floatingView.net = floating.get(node)
self.floatingView.drawMindMap(vs)
j = self.floatingView.net.iterator(node)
@@ -98,7 +98,7 @@
else:
self.place(vs, node, floating.get(node))
- def floatingBuffer(self, vs, buffer):
+ def floatingBuffer(self, vs, into, buffer):
map = java.util.HashMap()
if len(buffer) == 0: return map
@@ -107,22 +107,22 @@
if self.structLink.isLinked(buffer[i]):
path = java.util.ArrayList(1)
path.add(buffer[i])
- cs = self.singleCS(vs, buffer[i], Math.toRadians(i*d))
+ cs = self.singleCS(vs, into, buffer[i], Math.toRadians(i*d))
cs = vs.coords.translate(cs, 0,0, 100)
vs.matcher.add(cs, "Floating_"+buffer[i])
map.put(buffer[i], self.floatingView.geometry.buildMindNet(vs,
cs, path))
else:
- map.put(buffer[i], self.singleCS(vs, buffer[i],
Math.toRadians(i*d)))
+ map.put(buffer[i], self.singleCS(vs, into, buffer[i],
Math.toRadians(i*d)))
return map
- def singleCS(self, vs, node, angle):
+ def singleCS(self, vs, into, node, angle):
angle += 0.5 * Math.PI
angle %= 2.0 * Math.PI
wi, h = vs.size.width, vs.size.height
- a, b = wi/2.3, h/2.99
+ a, b = wi/2.3, h/2.3
x0,y0 = wi/2.0, h/2.0
- bx, by = wi/7, h/27
+ bx, by = 1,1
e = Math.sqrt(1 - b**2/a**2)
@@ -131,7 +131,7 @@
x = r * Math.cos(angle) + x0
y = -r * Math.sin(angle) + y0
- cs = vs.orthoBoxCS(0, node, -100, x-bx/2,y-by/2, 1,1, bx,by)
+ cs = vs.orthoBoxCS(into, node, -100, x-bx/2,y-by/2, 1,1, bx,by)
return cs
def place(self, vs, node, cs):