[ff-cvs] fenfire/org/fenfire bin/fenpdf10.py demo/mm.py ...

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/16 02:30:26

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

Log message:
        fixing text cursor when text is scaled by depth and graph could be 
independently zoomed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.43 
fenfire/org/fenfire/bin/fenpdf10.py:1.44
--- fenfire/org/fenfire/bin/fenpdf10.py:1.43    Fri Aug 15 01:13:51 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Sat Aug 16 02:30:26 2003
@@ -409,13 +409,13 @@
         if single:
             self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
                 [mainNode], connectors, self.eventHandler,
-               ff.view.doublegeometer.DoubleGeometer(),
-               ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
+               ff.fenpdf.doublegeometer.DoubleGeometer(),
+               ff.fendpf.fenpdfgeometry.FenPDFGeometryConfiguration())
         else:
             self.buoyManager = vob.buoy.buoymanager.MultiBuoyManager(
                 [mainNode, mainNode2], connectors, self.eventHandler,
-               ff.view.doublegeometer.DoubleGeometer(),
-               ff.view.fenpdfgeometry.FenPDFGeometryConfiguration())
+               ff.fenpdf.doublegeometer.DoubleGeometer(),
+               ff.fenpdf.fenpdfgeometry.FenPDFGeometryConfiguration())
 
         w.setCursor('default')
 
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.17 fenfire/org/fenfire/demo/mm.py:1.18
--- fenfire/org/fenfire/demo/mm.py:1.17 Fri Aug 15 15:05:59 2003
+++ fenfire/org/fenfire/demo/mm.py      Sat Aug 16 02:30:26 2003
@@ -192,20 +192,23 @@
             nodeScale = (100+into[2])+4
             if mindView.maxDepth > 40: nodeScale *= 40./mindView.maxDepth
             nodeScale = 1-math.log10(nodeScale/4.)
-            nodeview.setScale(1)
-
+        
             if node == self.context.main.getPlane():
+                # from border to linked
                 self.context.scale = self.context.main.getFocus().getZoom()
                 self.context.offset = nodeview.getPos(fen.graph, 
context.getAccursed(),
                                                   
(x-into[0])/self.context.scale/nodeScale,
                                                   
(y-into[1])/self.context.scale/nodeScale)
             elif ff.util.RDFUtil.isLinked(fen.graph, node):
+                # from linked or border to another linked
+                self.context.scale = self.context.main.getFocus().getZoom()
                 self.context.offset = nodeview.getPos(fen.graph, 
context.getAccursed(),
                                                  
(x-into[0])/self.context.scale/nodeScale,
                                                  
(y-into[1])/self.context.scale/nodeScale)
                 self.context.scale = 1
                 self.context.main.setNewPlane(node, 0,0,1)
             else:
+                # from border to border
                 self.context.scale = 1
                 self.context.offset = nodeview.getPos(fen.graph, 
context.getAccursed(),
                                                   
(x-into[0])/self.context.scale/nodeScale,
@@ -408,6 +411,7 @@
             if context.offset < len(text): context.offset -= 1
         elif len(key) == 1:
             """Enter a character into the cursor position."""
+            context.scale = 1
             context.insertText(key)
 
         if dbg:
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.20 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.21
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.20 Fri Aug 15 15:05:59 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Sat Aug 16 02:30:26 2003
@@ -1,4 +1,4 @@
-# (c): Matti J. Katila
+# (c): Matti J. Katila, Asko Soukka
 
 from __future__ import nested_scopes
 import java, jarray, math
@@ -69,7 +69,6 @@
         self.place(key, vs, cs)
 
     def place(self, node, vs, cs):
-        self.viewfunc.setScale(1.)
         p = self.viewfunc.f(self.fen.graph, node)
 
         cs_background = vs.orthoCS(cs,'WHITE_GROUND',0, 0, 0, p.getWidth(), 
p.getHeight())
@@ -135,7 +134,7 @@
         #self.N", 21, 3, "N", "N", "n"),
         self.fillets = 1
         #self.size", 100, 10, "Node size", "K", "k"),
-        self.dice = 4
+        self.dice = 10
         self.fillet3d = 1
         self.blend3d = 0 
         self.linewidth = 2
@@ -355,6 +354,7 @@
 
         self.nodef.setScale(scale)
         p = self.nodef.f(self.fen.graph, node)
+        self.nodef.setScale(1.)
 
         x = - p.getWidth()/2.0
         y = - p.getHeight()/2.0