[ff-cvs] fenfire/org/fenfire/demo mm.py

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/09/12 08:16:09

Modified files:
        org/fenfire/demo: mm.py 

Log message:
        some trivial, but uses still much old api (and won't run)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.57 fenfire/org/fenfire/demo/mm.py:1.58
--- fenfire/org/fenfire/demo/mm.py:1.57 Fri Sep  5 06:13:30 2003
+++ fenfire/org/fenfire/demo/mm.py      Fri Sep 12 08:16:09 2003
@@ -100,7 +100,7 @@
 vs.put(background((.5, .5, .5)))
 w.renderStill(vs, 0)
 
-fen = ff.Fen()
+(fen, ff_structure, contentFunction) = ff.test.fen.newFen()
 
 if do_load_graph:
     m = ModelMem()
@@ -108,21 +108,18 @@
     fen.constgraph = fen.graph = ff.swamp.Graphs.toGraph(m);
 else: fen.graph = fen.constgraph = ff.swamp.impl.HashGraph()
 
-fen.txt = ff.impl.SimpleNodeContent(fen, myalph);
-fen.txtfunc = fen.txt.getNodeFunction()
-fen.enfiladeOverlap = fen.txt.getTransclusionIndex()
-
 style = vob.GraphicsAPI.getInstance().getTextStyle("sansserif", 0, 24)
 
 # nodeview for normal nodes
-normal_text = ff.view.TextNodeView(fen.txtfunc, style, java.awt.Color(0., 0., 
0.), 250.)
+normal_text = ff.view.TextNodeView(contentFunction, style, java.awt.Color(0., 
0., 0.), 250.)
 normal_text_bg = ff.fenmm.WhiteNodeView(normal_text, java.awt.Color(.6, .6, 
.6))
 normalf = ff.swamp.CachedPureNodeFunction(100, fen.graph, normal_text_bg)
 
 # nodeview for accursed nodes
-accursed_text = ff.view.TextNodeView(fen.txtfunc, style, java.awt.Color.black, 
250.)
+accursed_text = ff.view.TextNodeView(contentFunction, style, 
java.awt.Color.black, 250.)
 accursed_text_bg = ff.fenmm.WhiteNodeView(accursed_text, java.awt.Color(.9, 
.9, .9))
 accursedf = ff.swamp.CachedPureNodeFunction(100, fen.graph, accursed_text_bg)
+
 multiplexer = ff.swamp.MultiplexerNodeFunction(normalf, accursedf)
 
 structLink = ff.structure.StructLink.create(fen.graph)
@@ -318,7 +315,7 @@
             cursor.setAccursed(node)
 
             ### something easier to allow setOffset(x,y) before rendering
-            nodeview = ff.view.TextNodeView(self.fen.txtfunc, 
self.context.style, 250.)
+            nodeview = ff.view.TextNodeView(self.contentFunction, 
self.context.style, 250.)
             self.context.c.setTextPlaceable(nodeview.f(fen.graph, node))
 
             # set cursor, transitions between zoomed and normal should be 
accounted
@@ -371,7 +368,7 @@
 
 class MMScene:
     def __init__(self):
-        self.alphContent = ff.util.AlphContent(fen)
+        self.alphContent = ff.util.AlphContent(fen, ff_structure)
         components, centered = self.compinit()
 
         self.context = Context(fen, w, components, multiplexer, style)
@@ -484,7 +481,7 @@
 
         # draw cursor
         if accursed:
-            nodeview = ff.view.TextNodeView(fen.txtfunc, style, 250.)
+            nodeview = ff.view.TextNodeView(contentFunction, style, 250.)
             if hasattr(self.view, "zoomPanCS") \
                and (structLink.isLinked(accursed) or 
self.context.main.getPlane() == accursed):
                     self.context.c.render(vs, self.view.zoomPanCS, cs, 
nodeview.f(fen.graph, accursed))