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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/07 15:40:50

Modified files:
        org/fenfire/demo: buoyoing.py 

Log message:
        FenPDF twids

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.59 
fenfire/org/fenfire/demo/buoyoing.py:1.60
--- fenfire/org/fenfire/demo/buoyoing.py:1.59   Fri Jun  6 16:04:33 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sat Jun  7 15:40:49 2003
@@ -98,8 +98,9 @@
     paperB = ppAct.newPaper()
     noteB1 = Nodes.get(ppAct.newNote(paperB, 1000,500, 'This is an another 
test!'))
 
-    ppAct.assocNotes(noteB1, 1, noteA1)
-    ppAct.assocNotes(noteB1, -1, noteA1)
+    ppAct.assocNotes(noteA1, 1, noteB1)
+
+    paperC = ppAct.newPaper()
 
 
 vob.view.FisheyeState.dbg = 1
@@ -140,9 +141,10 @@
 #irregu.type = 2
 
 plane = Nodes.get(paperA)
+planeC = Nodes.get(paperC)
 
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
-mainNode2 = ff.view.buoy.MainNode2D(plane, irregu)
+mainNode2 = ff.view.buoy.MainNode2D(planeC, irregu)
 #mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
 #connector = ff.view.buoy.PPConnector(fen, paperviewonly)
@@ -172,10 +174,10 @@
 
         w,h = vs.size.width, vs.size.height
 
-       s0 = self.split ** .5
-       s1 = (1-self.split) ** .5
+       #s0 = self.split ** .5
+       #s1 = (1-self.split) ** .5
 
-       mainsize = w * .9
+       #mainsize = w * .9
        #w0 = (self.split ** 0.5) * mainsize
        #w1 = ((1-self.split) ** 0.5) * mainsize
 
@@ -191,10 +193,19 @@
         #    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
+        #w0 = mainsize * self.split / s0
+        #w1 = mainsize / s1
+        #h0 = (self.split+.25) * h
+        #h1 = (1-self.split) * h
+
+        w0 = w/2
+        h0 = w/2
+
+        w1 = w+100
+        h1 = h/4+100
+
+        s0 = 1
+        s1 = .8
 
        ctrx = w/2
 
@@ -213,10 +224,10 @@
                      w0, h0)
 
        vs.coords.setOrthoBoxParams(self.into2, 0, 
-                     ctrx - .5*w1*s1,
-                      0+h0-80,
+                     -50,
+                      h-h1+50,
                      s1, s1, 
-                     w1, h1)
+                     w1/s1, h1/s1)
 
        vs.coords.setOrthoBoxParams(self.buoyinto1, 0, 
                      ctrx - .5*buoywidth0, 0 +  .5*h0 - .5*buoyheight0,