[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa...
From: |
Asko Soukka |
Subject: |
[ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa... |
Date: |
Tue, 26 Aug 2003 09:21:10 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Asko Soukka <address@hidden> 03/08/26 09:21:10
Modified files:
org/fenfire/demo: mm.py
org/fenfire/view/lava: mindMapView2D.py
Log message:
simplifying floating
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.41 fenfire/org/fenfire/demo/mm.py:1.42
--- fenfire/org/fenfire/demo/mm.py:1.41 Tue Aug 26 05:40:35 2003
+++ fenfire/org/fenfire/demo/mm.py Tue Aug 26 09:21:09 2003
@@ -258,12 +258,11 @@
if node == self.context.main.getPlane(): # from border to linked
cursor.setOffset((x-into[0])/scale/nodeScale,
(y-into[1])/scale/nodeScale)
elif structLink.isLinked(node): # from linked or border to another
linked
- representative = self.context.floatingHash.get(node)
- if representative != None:
- self.context.components.remove(representative)
+ try:
+ self.context.components.remove(node)
self.context.components.append(main.getPlane())
cursor.setOffset((x-into[0])/nodeScale,
(y-into[1])/nodeScale)
- else:
+ except ValueError:
cursor.setOffset((x-into[0])/scale/nodeScale,
(y-into[1])/scale/nodeScale)
focus = main.getFocus()
@@ -275,10 +274,8 @@
if node == main.getPlane(): pass
elif self.context.rmLinkTo(node, main.getPlane()) == 0:
self.fen.graph.add(main.getPlane(), STRUCTLINK.linkedTo, node)
- representative = self.context.floatingHash.get(node)
- if representative != None:
- self.context.components.remove(representative)
-
+ try: self.context.components.remove(node)
+ except ValueError: pass
class ZoomPan(vob.input.RelativeAxisListener, Action,
vob.mouse.MousePressListener):
def pressed(self, x,y):
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.46
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.47
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.46 Tue Aug 26 05:47:42 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py Tue Aug 26 09:21:10 2003
@@ -64,7 +64,6 @@
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()
@@ -92,9 +91,6 @@
if self.structLink.isLinked(node):
self.floatingView.net = floating.get(node)
self.floatingView.drawMindMap(vs)
-# j = self.floatingView.net.iterator(node)
- self.context.floatingHash.put(node, node)
-# while (j.hasNext()): self.context.floatingHash.put(j.next(),
node)
else:
self.place(vs, node, floating.get(node))
@@ -170,7 +166,7 @@
self.dice = 10
self.fillet3d = 1
self.blend3d = 0
- self.linewidth = 2
+ self.linewidth = 1
self.perspective = 0
self.texture = 0
self.dicelen = 100
@@ -234,6 +230,11 @@
depth = self.net.getDepth(node)
if depth < self.depth:
self.putNodeContent(vs, node, cs)
+ else:
+ p = self.multiplexer.f(self.fen.graph, node)
+ cs = vs.orthoBoxCS(cs, node, 0, 0, 0, 0, 0, 0, 0)
+ p.place(vs, cs)
+
def putNodeContent(self, vs, node, into):
# scaling after depth
@@ -248,18 +249,5 @@
cs = vs.orthoBoxCS(into, node,0, x,y, textScale, textScale,
p.getWidth(), p.getHeight())
p.place(vs, cs)
-
- ## XXX This could work, but setting TextCursor after selecting, would
be difficult
- # set the active coordinate system coverage
- #if x > 0:
- # x = 0
- # w = self.filletWidth*scale
- #else: w = p.getWidth()*textScale
- #if y > 0:
- # y = 0
- # h = self.filletWidth*scale
- #else: h = p.getHeight()*textScale
- #
- #cs = vs.orthoBoxCS(into,node,0, x,y, textScale, textScale, w, h)
vs.coords.activate(cs)
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/14
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/15
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/15
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/18
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/18
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/18
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/24
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa...,
Asko Soukka <=
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/26
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/27
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/27
- [ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa..., Asko Soukka, 2003/08/28