[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: |
Mon, 18 Aug 2003 09:48:43 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Asko Soukka <address@hidden> 03/08/18 09:48:43
Modified files:
org/fenfire/demo: mm.py
org/fenfire/view/lava: mindMapView2D.py
Log message:
caching BGs
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.23 fenfire/org/fenfire/demo/mm.py:1.24
--- fenfire/org/fenfire/demo/mm.py:1.23 Mon Aug 18 07:33:19 2003
+++ fenfire/org/fenfire/demo/mm.py Mon Aug 18 09:48:43 2003
@@ -117,16 +117,16 @@
textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sansserif", 0, 24)
# normal
-normal_text = ff.view.TextNodeView(fen.txtfunc, textstyle, java.awt.Color(0.5,
0.1, 1))
-normal_text_bg = ff.fenmm.WhiteNodeView(normal_text, None)
+normal_text = ff.view.TextNodeView(fen.txtfunc, textstyle, java.awt.Color(0.,
0., 0.))
+normal_text_bg = ff.fenmm.WhiteNodeView(normal_text, java.awt.Color(.6, .6,
.6))
normal = ff.swamp.CachedPureNodeFunction(100, fen.constgraph, normal_text_bg)
# accursed
accursed_text = ff.view.TextNodeView(fen.txtfunc, textstyle,
java.awt.Color.black)
-accursed = ff.swamp.CachedPureNodeFunction(100, fen.constgraph, accursed_text)
+accursed_text_bg = ff.fenmm.WhiteNodeView(accursed_text, java.awt.Color(.9,
.9, .9))
+accursed = ff.swamp.CachedPureNodeFunction(100, fen.constgraph,
accursed_text_bg)
multiplexer = ff.swamp.MultiplexerNodeFunction(normal, accursed)
-
mindView = ff.view.lava.mindMapView2D.MindMapView2D(fen, multiplexer)
@@ -189,7 +189,13 @@
if iter.hasNext(): return 1
return 0
- def setAccursed(self, node):
+ def setAccursed(self, node, multiplexer = None):
+ set = java.util.HashSet()
+ set.add(node)
+ if multiplexer:
+ multiplexer.setMultiplexerNodes(set)
+ self.main.multiplexer.setMultiplexerNodes(set)
+
self._accursed = node
if self._accursed != None:
self.offset = len(alphContent.getText(fen.graph, self._accursed))
@@ -224,10 +230,6 @@
context = Context()
-## obsolete
-#nodeview.setContext(context)
-
-
if not do_load_graph:
context.home = ff.util.RDFUtil.N(fen.graph, MINDSTRUCT.Data)
alphContent.insertText(context.home, 0, 'home', 1)
@@ -253,10 +255,7 @@
rmb = context.rmb_switch[0]
if rmb == 'go':
- self.context.setAccursed(node)
- set = java.util.HashSet()
- set.add(node)
- multiplexer.setMultiplexerNodes(set)
+ self.context.setAccursed(node, multiplexer)
# set cursor, transitions between zoomed and normal should be
accounted
cs = vs.getCSAt(0, x,y, None)
@@ -345,6 +344,7 @@
# contexts for e.g. drawCursor callbacks and delivering accursedNode
self.main.context = context
+ self.main.setColors(fen)
mindView.context = context
# flag for cursor('wait')
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.28
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.29
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.28 Mon Aug 18 07:34:45 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py Mon Aug 18 09:48:43 2003
@@ -36,18 +36,25 @@
dbg = 0
-paper = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.6, .6, .6))
-paper_accursed = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.9, .9,
.9))
-paper_unused = vob.gl.SpecialPapers.selectionPaper(java.awt.Color(.6, .6, 0))
-whiteground = vob.gl.GLRen.createFixedPaperQuad(paper, 0, 0, 1, 1, 0, 10, 10,
10)
-whiteground_accursed = vob.gl.GLRen.createFixedPaperQuad(paper_accursed, 0, 0,
1, 1, 0, 10, 10, 10)
-whiteground_unused = vob.gl.GLRen.createFixedPaperQuad(paper_unused, 0, 0, 1,
1, 0, 10, 10, 10)
-
-
class MindMapMainNode2D(ff.view.buoy.MainNode2D):
def __init__(self, plane, view2d, focus, controller):
ff.view.buoy.MainNode2D.__init__(self, plane, view2d, controller);
self.context = None
+
+ def setColors(self, fen):
+ textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sansserif", 0,
24)
+
+ # normal
+ normal_text = ff.view.TextNodeView(fen.txtfunc, textstyle,
java.awt.Color(0., 0., 0.))
+ normal_text_bg = ff.fenmm.WhiteNodeView(normal_text,
java.awt.Color(.6, .6, 0))
+ normal = ff.swamp.CachedPureNodeFunction(100, fen.constgraph,
normal_text_bg)
+
+ # accursed
+ accursed_text = ff.view.TextNodeView(fen.txtfunc, textstyle,
java.awt.Color.black)
+ accursed_text_bg = ff.fenmm.WhiteNodeView(accursed_text,
java.awt.Color(.9, .9, .9))
+ accursed = ff.swamp.CachedPureNodeFunction(100, fen.constgraph,
accursed_text_bg)
+
+ self.multiplexer = ff.swamp.MultiplexerNodeFunction(normal, accursed)
def init(self, fen, nodeview):
self.fen, self.viewfunc = fen, nodeview
@@ -90,13 +97,8 @@
self.place(key, vs, cs)
def place(self, node, vs, cs):
- p = self.viewfunc.f(self.fen.graph, node)
+ p = self.multiplexer.f(self.fen.graph, node)
- cs_background = vs.orthoCS(cs,'WHITE_GROUND',0, 0, 0, p.getWidth(),
p.getHeight())
- if self.context and self.context.getAccursed() == node:
- vs.put(whiteground_accursed, cs_background)
- else: vs.put(whiteground_unused, cs_background)
-
cs = vs.orthoBoxCS(cs,node,0, 0, 0, 1,1, p.getWidth(), p.getHeight())
p.place(vs, cs)
vs.coords.activate(cs)
@@ -137,7 +139,7 @@
#self.size", 100, 10, "Node size", "K", "k"),
self.dice = 10
self.fillet3d = 1
- self.blend3d = 0
+ self.blend3d = 0
self.linewidth = 2
self.perspective = 0
self.texture = 0
@@ -242,11 +244,11 @@
if dbg: p('info:', pl2[0], pl2[1], pl2[2])
if dbg: p('fillet..', c, )
+
def pc(conns, cs):
if self.context and self.context.getAccursed() == node:
- vs.put(vob.putil.misc.getDListNocoords("Color 1. 0. 0."))
+ vs.put(vob.putil.misc.getDListNocoords("""Color 1. 0.
0."""))
vs.put(conns, cs+c)
-# print cs, c, node
# draw fillets
vob.fillet.light3d.drawFillets(self, vs, pc)
@@ -360,5 +362,3 @@
vs.coords.transformPoints3(cs, [0,0,0], into)
cs = vs.orthoCS(0, 0, -100, into[0], into[1], 1, 1)
self.context.drawCursor(vs, node, 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 <=
- [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, 2003/08/26
- [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