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

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/17 06:04:40

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

Log message:
        Switching to single view properly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/doublegeometer.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.46 
fenfire/org/fenfire/bin/fenpdf10.py:1.47
--- fenfire/org/fenfire/bin/fenpdf10.py:1.46    Sat Aug 16 08:38:50 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Sun Aug 17 06:04:40 2003
@@ -402,20 +402,16 @@
        
 
 class Scene:
-    def __init__(self, context, single = 0):
-        self.single = single
+    def __init__(self):
+       global context
         self.eventHandler = EventHandler(context)
         self.buoyManager = None
-        if single:
-            self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
-                [mainNode], connectors, self.eventHandler,
-               ff.view.doublegeometer.DoubleGeometer(),
-               ff.fenpdf.fenpdfgeometry.FenPDFGeometryConfiguration())
-        else:
-            self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
-                [mainNode, mainNode2], connectors, self.eventHandler,
-               ff.view.doublegeometer.DoubleGeometer(),
-               ff.fenpdf.fenpdfgeometry.FenPDFGeometryConfiguration())
+       self.doubleGeometer = ff.view.doublegeometer.DoubleGeometer()
+
+       self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
+           [mainNode, mainNode2], connectors, self.eventHandler,
+           self.doubleGeometer,
+           ff.fenpdf.fenpdfgeometry.FenPDFGeometryConfiguration())
 
         w.setCursor('default')
 
@@ -432,22 +428,21 @@
         if not self.eventHandler.contextMouse(ev, self.context.states.vs):
             self.buoyManager.mouse(ev)
     def key(self, key):
-        self.eventHandler.key(key)
-
-currentScene = Scene(context)
 
-def globalkey(k):
-    if k == "Ctrl-P":
-        s = Scene(context)
-        vs = s.getVs()
-        w.renderStill(vs, 0);
-        saveanim.saveframe("/tmp/buoyframeWithHand.png", w)
-        
-    if k == "Ctrl-S":
-        global currentScene
-        currentScene = Scene(context, 1 - currentScene.single)
-        vob.AbstractUpdateManager.chg()
-        
+       if key == "Ctrl-P":
+           s = Scene(context)
+           vs = s.getVs()
+           w.renderStill(vs, 0);
+           saveanim.saveframe("/tmp/buoyframeWithHand.png", w)
+           
+       if key == "Ctrl-S":
+           global currentScene
+           currentScene.doubleGeometer.setSingle(
+               not currentScene.doubleGeometer.getSingle())
+           print "Set single: ",currentScene.doubleGeometer.getSingle()
+           vob.AbstractUpdateManager.chg()
+           
+           self.eventHandler.key(key)
 
 
 
Index: fenfire/org/fenfire/view/doublegeometer.py
diff -u fenfire/org/fenfire/view/doublegeometer.py:1.4 
fenfire/org/fenfire/view/doublegeometer.py:1.5
--- fenfire/org/fenfire/view/doublegeometer.py:1.4      Sat Aug 16 08:38:50 2003
+++ fenfire/org/fenfire/view/doublegeometer.py  Sun Aug 17 06:04:40 2003
@@ -12,6 +12,7 @@
        self.split = .5
        self.height = 100
        self.width = 100
+       self.single = 0
     def _doset(self, vs):
 
         w,h = vs.size.width, vs.size.height
@@ -40,27 +41,46 @@
         #h0 = (self.split+.25) * h
         #h1 = (1-self.split) * h
 
-        h0 = h * .66
+       if not self.single:
 
-        h1 = h - h0
+           h0 = h * .66
 
-        s0 = 1.
-        s1 = .8
+           h1 = h - h0
 
-       vs.coords.setOrthoBoxParams(self.mainbox1, 1,
-                       0, 0, s0, s0, w/s0, h0/s0);
-       vs.coords.setOrthoBoxParams(self.mainbox2, 1,
-                       0, h0, s1, s1, w/s1, h1/s1);
+           s0 = 1.
+           s1 = .8
 
+           vs.coords.setOrthoBoxParams(self.mainbox1, 1,
+                           0, 0, s0, s0, w/s0, h0/s0);
+           vs.coords.setOrthoBoxParams(self.mainbox2, 1,
+                           0, h0, s1, s1, w/s1, h1/s1);
+
+       else:
+           
+           vs.coords.setOrthoBoxParams(self.mainbox1, 1,
+                           0, 0, 1, 1, w, h);
+
+
+    def setSingle(self, flag):
+       """Set whether to show only topmost view.
+       """
+       self.single = flag
+    def getSingle(self):
+       return self.single
        
     def place(self, vs):
+       print "DG place ",self.single
        self.height = vs.size.height
        self.width = vs.size.width
 
        self.mainbox1 = vs.orthoBoxCS(0,"MainFrame1", 0, 0, 0, 0, 0, 0, 0);
-       self.mainbox2 = vs.orthoBoxCS(0,"MainFrame2", 0, 0, 0, 0, 0, 0, 0);
+
+       if not self.single:
+           self.mainbox2 = vs.orthoBoxCS(0,"MainFrame2", 0, 0, 0, 0, 0, 0, 0);
+       else:
+           self.mainbox2 = -1
 
        self._doset(vs)
 
-       return [(self.mainbox1, None, None), 
-               (self.mainbox2, None, None)]
+       return [(self.mainbox1,), 
+               (self.mainbox2,)]