[ff-cvs] libvob/vob/buoy buoymanager.py geom.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/20 12:36:22

Modified files:
        vob/buoy       : buoymanager.py 
Added files:
        vob/buoy       : geom.py 

Log message:
        Move geometry example classes out of buoymanager

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/geom.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.61&tr2=1.62&r1=text&r2=text

Patches:
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.61 libvob/vob/buoy/buoymanager.py:1.62
--- libvob/vob/buoy/buoymanager.py:1.61 Tue Aug 19 12:01:32 2003
+++ libvob/vob/buoy/buoymanager.py      Wed Aug 20 12:36:22 2003
@@ -53,24 +53,6 @@
 def pa(*s):
     print 'buoymanager::',s
 
-class DummyGeometryConfiguration(BuoyGeometryConfiguration):
-    """A dummy constant geometry.
-    """
-    def __init__(self):
-       self.buoyMainViewGeometer = vob.buoy.impl.RatioMainGeometer(
-                                       .21, .25, .6, .5)
-       self.buoySizer = vob.buoy.impl.AspectBuoySizer(400, 400, 1.5)
-       self.buoyGeometer = vob.buoy.impl.RatioBuoyOnCircleGeometer(
-                                   .1, .1, .8, .8)
-    def getMainViewGeometer(self, node):
-       return self.buoyMainViewGeometer
-    def getSizer(self, node, connector):
-       return self.buoySizer
-    def getGeometer(self, node, connector):
-       return self.buoyGeometer
-    def getGeometers(self, node):
-       return [self.buoyGeometer]
-
 pa("LOADING BUOYMANAGER")
 class SingleFocusManager(BuoyLinkListener):
     """Manage buoys through the new APIs
@@ -223,7 +205,7 @@
 
 class MultiBuoyManager:
     def __init__(self, mainNodes, connectors, eventHandler,
-                   geometer, buoyGeometryConfiguration = 
DummyGeometryConfiguration()):
+                   geometer, buoyGeometryConfiguration):
        self.singles = [
            SingleFocusManager(i, connectors, buoyGeometryConfiguration) for i 
in mainNodes]
         self.buoyGeometryConfiguration = buoyGeometryConfiguration
@@ -330,19 +312,3 @@
         return 0
 
 vob.impl.gl.GLScreen.dbg = 0
-
-class SingleGeometer:
-    def place(self, vs):
-       ctrx = vs.size.width / 2
-       ctry = vs.size.height * .485 # A *little* above real ctr
-
-       center = vs.translateCS(0, "FocusCenter", ctrx, ctry)
-
-       mainbox = vs.orthoBoxCS(center, "MainFrame", 0,
-                           -vs.size.width * .5, -vs.size.height * .5,
-                           1, 1,
-                           vs.size.width, vs.size.height);
-
-       return [(mainbox, None, None)]
-
-