[Gzz-commits] libvob/vob/buoy buoymanager.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/11 14:52:27

Modified files:
        vob/buoy       : buoymanager.py 

Log message:
        Broken change - something wrong with laptop, need to move to desktop. 
Lots of restructuring - Geometer should NOT take care of all events\!\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text

Patches:
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.48 libvob/vob/buoy/buoymanager.py:1.49
--- libvob/vob/buoy/buoymanager.py:1.48 Mon Aug 11 08:10:35 2003
+++ libvob/vob/buoy/buoymanager.py      Mon Aug 11 14:52:27 2003
@@ -77,7 +77,7 @@
 
     This is a demo "scene"
     """
-    def __init__(self, mainNode, connectors):
+    def __init__(self, mainNode, connectors, buoyGeometryConfiguration):
        """Create a new RealBuoyManager.
 
         Parameters are the initial main node
@@ -87,7 +87,7 @@
        self.mainNode = mainNode
         self.connectors = connectors
 
-       self.geometryConfiguration = DummyGeometryConfiguration()
+       self.geometryConfiguration = buoyGeometryConfiguration
 
     def getMainNode(self):
         return self.mainNode
@@ -224,10 +224,12 @@
         
 
 class MultiBuoyManager:
-    def __init__(self, mainNodes, connectors, geometer):
+    def __init__(self, mainNodes, connectors, eventHandler,
+                   geometer, buoyGeometryConfiguration = 
DummyGeometryConfiguration()):
        self.singles = [
-           SingleFocusManager(i, connectors) for i in mainNodes]
+           SingleFocusManager(i, connectors, buoyGeometryConfiguration) for i 
in mainNodes]
         self.connectors = connectors
+       self.eventHandler = eventHandler
        self.geometer = geometer
        self.replaceScene = None
         self.lastIndex = 0
@@ -277,9 +279,8 @@
             vob.AbstractUpdateManager.chg()
             return
 
-       if hasattr(self.geometer, 'mouse') and \
-               self.geometer.mouse(ev, self.vs):
-           return 
+       if self.eventHandler.mouse(ev, self.vs):
+           return
 
         if ev.getType() == ev.MOUSE_DRAGGED:
             if self.singles[self.lastIndex].mainNode.mouse(ev, self.vs):
@@ -295,8 +296,7 @@
            if link != None:
                 # pa("IN CS: ",cs, link)
                 self.buoyHit.set(single, link)
-                if hasattr(self.geometer, 'buoyMouse') and \
-                   self.geometer.buoyMouse(self, ev, single, link):
+                if self.eventHandler.buoyMouse(self, ev, single, link):
                     return
                 
                if ev.getType() != ev.MOUSE_CLICKED: