[Gzz-commits] fenfire/org/fenfire demo/mm.py view/lava/mindMa...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/13 06:57:41

Modified files:
        org/fenfire/demo: mm.py 
        org/fenfire/view/lava: mindMapView2D.py 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.3 fenfire/org/fenfire/demo/mm.py:1.4
--- fenfire/org/fenfire/demo/mm.py:1.3  Wed Aug 13 06:17:51 2003
+++ fenfire/org/fenfire/demo/mm.py      Wed Aug 13 06:57:41 2003
@@ -228,10 +228,9 @@
 
     def mouse(self, ev):
         if self.main.mouse(ev, context.oldVS):
+            pass
             # replace scene..
-            p('fast')
             # vob.AbstractUpdateManager.setNoAnimation()
-        else: p('slow')
         vob.AbstractUpdateManager.chg()
         
     def key(self, key):
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.7 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.8
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.7  Wed Aug 13 06:17:51 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Wed Aug 13 06:57:41 2003
@@ -137,7 +137,9 @@
 
     def getNodeSize(self, deepnes):
         """ good size  *  90% of every deepnes """
-        return (self.box[1] * 1./10.0) * (0.9 ** deepnes)
+        s =(self.box[1] * 1./10.0) * (0.9 ** deepnes)
+        if dbg: p('size:', s)
+        return s
 
     def getDistance(self, deepnes):
         """ good size  *  80% of every deepnes """
@@ -266,6 +268,7 @@
         x,y = xy[0], xy[1]
 
         s = self.getNodeSize(deepnes)
+        print 'size', s
         cs = vs.orthoBoxCS(into,'foo'+str(key),0, x-s/2.0,y-s/2.0, 1,1, s,s)
         if dbg:
             p('come:',x0,y0, angle, dirAngle)
@@ -284,10 +287,16 @@
     def putNodeContent(self, vs, node, cs):
         p = self.nodef.f(self.fen.graph, node)
 
-        cs_background = vs.orthoCS(cs,'background',0, 0,0, p.getWidth(), 
p.getHeight())
+        #box = jarray(2, 'f')
+        #vs.coords.
+
+        x = - p.getWidth()/2.0
+        y = - p.getHeight()/2.0
+
+        cs_background = vs.orthoCS(cs,'background',0, x,y, p.getWidth(), 
p.getHeight())
         vs.put(whiteground, cs_background)
 
-        cs = vs.orthoBoxCS(cs, node,0, 0,0, 1,1, p.getWidth(), p.getHeight())
+        cs = vs.orthoBoxCS(cs, node,0, x,y, 1,1, p.getWidth(), p.getHeight())
         p.place(vs, cs)
         vs.coords.activate(cs)