[ff-cvs] fenfire/org/fenfire demo/mm.py view/lava/mindMa...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/24 06:52:12

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

Log message:
        zoomfix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.33 fenfire/org/fenfire/demo/mm.py:1.34
--- fenfire/org/fenfire/demo/mm.py:1.33 Sun Aug 24 05:19:57 2003
+++ fenfire/org/fenfire/demo/mm.py      Sun Aug 24 06:52:11 2003
@@ -228,14 +228,15 @@
         self.context.setSlowAnimation()
         vs = self.context.oldVS
         node = vs.getKeyAt(0, x,y, None)
-        p('LBM click:', node)
+        #p('LBM click:', node)
 
         if node == None: return
 
         rmb = self.context.rmb_switch[0]
         main = self.context.main
+        cursor = self.context.c
         if rmb == 'go':
-            self.context.c.setAccursed(node)
+            cursor.setAccursed(node)
 
             ### something easier to allow setOffset(x,y) before rendering
             nodeview = ff.view.TextNodeView(self.fen.txtfunc, 
self.context.style)
@@ -247,8 +248,6 @@
             vs.coords.transformPoints3(cs, [0,0,0], into)
 
             scale = 1./main.getFocus().getZoom()
-            cursor = self.context.c
-            accursed = cursor.getAccursed()
 
             # scaling
             nodeScale = self.context.getTextScale(100+into[2])
@@ -257,7 +256,8 @@
                 cursor.setOffset((x-into[0])/scale/nodeScale, 
(y-into[1])/scale/nodeScale)
             elif structLink.isLinked(node): # from linked or border to another 
linked
                 cursor.setOffset((x-into[0])/scale/nodeScale, 
(y-into[1])/scale/nodeScale)
-                main.setNewPlane(node, 0,0,1)
+                focus = main.getFocus()
+                main.setNewPlane(node, focus.getPanX(), focus.getPanY(), 
focus.getZoom())
             else: # from border to border
                 cursor.setOffset((x-into[0])/nodeScale, (y-into[1])/nodeScale)
 
@@ -406,7 +406,7 @@
         
     def key(self, key):
         self.context.setSlowAnimation()
-        p("Entered key: ", key)
+#        p("Entered key: ", key)
         if key == 'Escape' or key == 'Tab':
             """Removes the focus from the current accursed node and sets no 
new accursed node."""
             self.context.c.setAccursed(None)
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.36 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.37
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.36 Sun Aug 24 05:19:58 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Sun Aug 24 06:52:11 2003
@@ -175,7 +175,7 @@
     def render(self, vs, node,
                matchingParent, box2screen, box2plane):
         self.matchingParent = matchingParent
-        p("Rendering view.")
+#        p("Rendering view.")
 
 #      if dbg:
 #            p('Drawing screenbox')