[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py test/test....

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/06/05 14:07:04

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/test: test.py 
        org/fenfire/view: papercanvas2d.test 

Log message:
        fix 1 test

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/test.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/papercanvas2d.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.57 
fenfire/org/fenfire/demo/buoyoing.py:1.58
--- fenfire/org/fenfire/demo/buoyoing.py:1.57   Mon May 26 15:05:18 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Thu Jun  5 14:07:03 2003
@@ -51,6 +51,8 @@
 import vob
 w.setCursor('wait')
 
+vob.putil.demo.usingNormalBindings = 0
+
 ff.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
 ff.util.PageSpanPaper.paperMillWindow = vob.putil.demowindow.w
 
@@ -170,17 +172,33 @@
        self.width = 100
     def _doset(self, vs):
 
-       h0 = self.split * self.height
-       h1 = (1-self.split) * self.height
-
-       mainsize = vs.size.width * .6
-       w0 = (self.split ** 0.5) * mainsize
-       w1 = ((1-self.split) ** 0.5) * mainsize
+        w,h = vs.size.width, vs.size.height
 
        s0 = self.split ** .5
        s1 = (1-self.split) ** .5
-       
-       ctrx = self.width / 2
+
+       mainsize = w * .9
+       #w0 = (self.split ** 0.5) * mainsize
+       #w1 = ((1-self.split) ** 0.5) * mainsize
+
+
+        #if self.split < .5:
+        #    w0 = mainsize / s0
+        #    w1 = mainsize * (1-self.split) / s1
+        #    h0 = self.split * h
+        #    h1 = (1-self.split+.25) * h
+        #else:
+        #    w0 = mainsize * self.split / s0
+        #    w1 = mainsize / s1
+        #    h0 = (self.split+.25) * h
+        #    h1 = (1-self.split) * h
+
+        w0 = mainsize * self.split / s0
+        w1 = mainsize / s1
+        h0 = (self.split+.25) * h
+        h1 = (1-self.split) * h
+
+       ctrx = w/2
 
        buoywidth0 = w0 * 1.4
        buoyheight0 = h0 * 1.2
@@ -191,12 +209,14 @@
         if (dbg): pa("SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0, 
buoywidth1)
 
        vs.coords.setOrthoBoxParams(self.into1, 0, 
-                     ctrx - .5*w0, 40,
+                     ctrx - .5*w0*s0,
+                      40,
                      s0, s0, 
                      w0, h0)
 
        vs.coords.setOrthoBoxParams(self.into2, 0, 
-                     ctrx - .5*w1, 0+h0,
+                     ctrx - .5*w1*s1,
+                      0+h0-80,
                      s1, s1, 
                      w1, h1)
 
@@ -236,6 +256,25 @@
            return 1
 
        return 0
+
+    def key(self, key):
+        if key == "+":
+            self.split += .03
+        elif key == "-":
+            self.split -= .03
+        if key == "Ctrl-Q":
+            from java.lang import System
+            System.exit(43)
+        elif key == "Ctrl-R":
+            vob.putil.demo.loadScenes()
+        elif key == "?":
+            vob.putil.demo.showHelp = 1-showHelp
+            vob.AbstractUpdateManager.setNoAnimation()
+        else:
+            return globalkey(key)
+
+        vob.AbstractUpdateManager.chg()
+        return 1
 
 
 class Scene(vob.buoy.buoymanager.MultiBuoyManager):
Index: fenfire/org/fenfire/test/test.py
diff -u fenfire/org/fenfire/test/test.py:1.11 
fenfire/org/fenfire/test/test.py:1.12
--- fenfire/org/fenfire/test/test.py:1.11       Sun May 11 12:10:21 2003
+++ fenfire/org/fenfire/test/test.py    Thu Jun  5 14:07:04 2003
@@ -119,6 +119,7 @@
 
 def load(file):
     name = os.path.splitext(file)[0]
+    while name.startswith('./'): name = name[2:]
     name = '.'.join(name.split('/'))
     name = '.'.join(name.split('\\'))
 
Index: fenfire/org/fenfire/view/papercanvas2d.test
diff -u fenfire/org/fenfire/view/papercanvas2d.test:1.9 
fenfire/org/fenfire/view/papercanvas2d.test:1.10
--- fenfire/org/fenfire/view/papercanvas2d.test:1.9     Fri May 23 10:26:08 2003
+++ fenfire/org/fenfire/view/papercanvas2d.test Thu Jun  5 14:07:04 2003
@@ -55,7 +55,7 @@
        1)
 
 
-    canvasView2D = ff.view.CanvasView2D(fen.graph, textnodeview)
+    canvasView2D = ff.view.CanvasView2D(fen, textnodeview)
 
     paperView2D = ff.view.PaperView2D(None, canvasView2D)
     paperView2D.paperMill = DummyMill(