[ff-cvs] fenfire/org/fenfire/bin fenpdf10.py

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/18 05:17:22

Modified files:
        org/fenfire/bin: fenpdf10.py 

Log message:
        multiplexing node function

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.49&tr2=1.50&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.49 
fenfire/org/fenfire/bin/fenpdf10.py:1.50
--- fenfire/org/fenfire/bin/fenpdf10.py:1.49    Mon Aug 18 03:47:19 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Mon Aug 18 05:17:21 2003
@@ -172,14 +172,24 @@
     ff.spanimages.gl.PageScrollBlockImager())
 spanImageFactory.paperMaker = ff.spanimages.gl.papermakers.fancyBlur()
 
+
+### Node functions
 textstyle = vob.GraphicsAPI.getInstance().getTextStyle("sans", 0, 24)
-textnodeview = ff.view.TextNodeView(fen.txtfunc, textstyle, 400)
 pagenodeview = ff.view.PageNodeView(fen.txtfunc, spanImageFactory)
-dispnodeview = ff.view.DispatchingNodeView(fen.txtfunc,
-                                           textnodeview,
-                                           pagenodeview)
-nodeview = ff.view.lava.ContextNodeView(dispnodeview, fen.constgraph, 150)
-view = ff.view.CanvasView2D(fen, nodeview)
+
+# accursed text
+accursed_text = ff.view.TextNodeView(fen.txtfunc, textstyle, 
java.awt.Color.red, 1.0)
+accursed_dispatcher = ff.view.DispatchingNodeView(fen.txtfunc, accursed_text, 
pagenodeview)
+accursed_function = ff.swamp.CachedPureNodeFunction(150, fen.constgraph, 
accursed_dispatcher)
+
+# normal text
+normal_text = ff.view.TextNodeView(fen.txtfunc, textstyle, 
java.awt.Color.black, 1.0)
+normal_dispatcher = ff.view.DispatchingNodeView(fen.txtfunc, normal_text, 
pagenodeview)
+normal_function = ff.swamp.CachedPureNodeFunction(150, fen.constgraph, 
normal_dispatcher)
+
+multiplexerNodeFunction = ff.swamp.MultiplexerNodeFunction(normal_function, 
accursed_function)
+
+view = ff.view.CanvasView2D(fen, multiplexerNodeFunction)
 view.cull = 1
 paperview = ff.view.PaperView2D(view)
 selection = ff.view.AreaSelectingView2D(paperview)
@@ -189,9 +199,7 @@
 ff.view.buoy.NodeType2DFull.effigy = 0
 
 
-context = Context(w, fen, ppActions, nodeview, spanImageFactory, FILE)
-nodeview.setContext(context)
-
+context = Context(w, fen, ppActions, multiplexerNodeFunction, 
spanImageFactory, FILE)
 context.ppView = irregu
 context.pageView = None
 context.states.alph = myalph
@@ -265,13 +273,13 @@
 mainNode = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
 mainNode2 = ff.view.buoy.MainNode2D(planeHome, irregu, mainMouse)
 
-
+### Connectors
 # PP(Canvas)
 ppconnector = ff.view.buoy.PPConnector(fen, irregu, 
                        ff.view.buoy.MainNode2D.MainNode2DFactory(1, mainMouse),
-                                       nodeview)
+                                       multiplexerNodeFunction)
 # Transclusion
-tconnector = ff.view.buoy.TransclusionConnector(fen, nodeview)
+tconnector = ff.view.buoy.TransclusionConnector(fen, multiplexerNodeFunction)
 pagescroll2d = ff.view.PageScrollView2D(spanImageFactory)
 context.states.view2d.pageview_without_surrounding = pagescroll2d
 pagescroll2d = ff.view.AreaSelectingView2D(pagescroll2d)
@@ -289,7 +297,7 @@
 
 
 connectors = [ppconnector, tconnector, ttconnector]
-#connectors = [ppconnector, tconnector]
+
 
 class EventHandler:
     def __init__(self, context):
@@ -329,12 +337,10 @@
                 return 1
 
             # There is a bug in AbstractUpdateManager code(?) and that's why 
now is must to return.
-            #return 1
         self.context.states.lastEvent = ev
         return 0
 
     def contextMouse(self, ev, oldvs):
-        # ...then see context
         if ev.getType() != ev.MOUSE_CLICKED:
             return 0