[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...

[Matti Katila]

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

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

Log message:
        destroying canvas and more work for fenpdf10

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.17 
fenfire/org/fenfire/bin/fenpdf10.py:1.18
--- fenfire/org/fenfire/bin/fenpdf10.py:1.17    Tue Aug 12 01:15:49 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Tue Aug 12 03:53:17 2003
@@ -272,6 +272,7 @@
                            actions.PanMover(context))
 context.states.mainMouse = mainMouse
 
+
 # Default controls for buoys
 buoyMouse = vob.mouse.MouseMultiplexer()
 # With button 1
@@ -317,8 +318,8 @@
 # connectors = [ppconnector, tconnector]
 
 class EventHandler:
-    def __init__(self, mgr, context):
-        self.mgr = mgr
+    def __init__(self, buoymgr, context):
+        self.buoyManager = buoymgr
         self.context = context
         self.context.setMngr(mgr)
     def mouse(self, ev, oldvs):
@@ -398,23 +399,34 @@
 
        
 
-class Scene(vob.buoy.buoymanager.MultiBuoyManager):
-    def __init__(self, single = 0):
+class Scene:
+    def __init__(self, context, single = 0):
         self.single = single
+
+        self.buoyManager = None
         if single:
-            vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
-               [mainNode], connectors,
+            self.buoyManager = 
vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
+                [mainNode], connectors,
                vob.buoy.buoymanager.SingleGeometer(self, context, nodeview),
                ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
         else:
-            vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
+            self.buoyManager = 
vob.buoy.buoymanager.MultiBuoyManager.__init__(self, 
                [mainNode, mainNode2], connectors,
                ff.view.doublegeometer.DoubleGeometer(self, context, nodeview),
                ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
+        self.eventHandler = EventHandler(self.buoyManager, context)
             
         w.setCursor('default')
 
-currentScene = Scene()
+
+    def mouse(self, ev):
+        if not self.buoyManager.mouse(ev):
+            self.eventHandler.mouse(ev)
+
+    def keystroke(self, key):
+        self.eventHandler.key(key)
+
+currentScene = Scene(context)
 
 
 def screenshots():
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.23 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.24
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.23      Mon Aug 11 10:15:20 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Tue Aug 12 03:53:17 2003
@@ -191,7 +191,20 @@
             a,b = link[1].first, link[1].second
             pp.detachNotes(a, 1, b)
             pp.detachNotes(a, -1, b)
-    
+
+    class KillPlane(Action):
+        def run(self):
+            main = self.s.mgr.getLastMain()
+            if isinstance(main, ff.view.buoy.MainNode2D):
+                self.s.pp.deletePaper(main.getPlane())
+            elif isinstance(main, ff.view.buoy.FisheyeMainNode2D):
+                p('foo fish eye')
+
+    class GoHome(Action):
+        def run(self):
+            #self.s.mgr.singles[1].mainNode = 
ff.view.buoy.MainNode2D(planeHome, irregu, ctrl)
+            
+
     def __init__(self, states):
         self.states = states
         self.style = vob.GraphicsAPI.getInstance().getTextStyle('sans', 0, 12)
@@ -201,7 +214,7 @@
         
     def makeMainList(self):
         self.list = vob.vobs.SelectListVob(self.style)
-        self.list.add('Destroy this paper', 'KillPlane(self.states)')
+        self.list.add('Destroy this canvas', self.KillPlane(self.states))
         if self.link:
             self.list.add('Link node to left', self.LinkL(self.states))
             self.list.add('Link node to rigth', self.LinkR(self.states))