fenfire-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMTextCurs...


From: Asko Soukka
Subject: [ff-cvs] fenfire/org/fenfire demo/mm.py fenmm/MMTextCurs...
Date: Mon, 25 Aug 2003 10:20:03 -0400

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/25 10:20:03

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

Log message:
        use ContinuosLineVob, though, there's awfully debug on by default 
somewhere...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMTextCursor.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.36 fenfire/org/fenfire/demo/mm.py:1.37
--- fenfire/org/fenfire/demo/mm.py:1.36 Mon Aug 25 04:40:27 2003
+++ fenfire/org/fenfire/demo/mm.py      Mon Aug 25 10:20:03 2003
@@ -244,7 +244,7 @@
             into = jarray.zeros(3, 'f')
             vs.coords.transformPoints3(cs, [0,0,0], into)
 
-            scale = 1./main.getFocus().getZoom()
+            scale = main.getFocus().getZoom()
 
             # scaling
             nodeScale = ff.fenmm.MMGeometry.getTextScale(int(100+into[2]))
@@ -265,43 +265,23 @@
 
 
 class ZoomPan(vob.input.RelativeAxisListener, Action, 
vob.mouse.MousePressListener):
-    def __init__(self, fen, context):
-        Action.__init__(self, fen, context)
-        self.oldZoom = 1.
     def pressed(self, x,y):
         return self
     def changedRelative(self, x):
-        x = x / 2.
-        main = self.context.main
-        f = main.getFocus()
-        fX, fY = f.getPanX(), f.getPanY()
-
-        dimensions = w.getSize()
-        fX -= dimensions.width*(-.5/self.oldZoom + .5)
-        fY -= dimensions.height*(-.5/self.oldZoom + .5)
-        fX += dimensions.width*(-.5/f.zoom + .5)
-        fY += dimensions.height*(-.5/f.zoom + .5)
-        f.setPan(fX, fY)
-        self.oldZoom = f.zoom
-        
-        if x: main.changeZoom(1./x)
-        else: main.changeZoom(0)
-        main.chgFast(self.context.oldVS, -1)
-
+        self.context.main.changeZoom(x)
+        self.context.main.chgFast(self.context.oldVS, -1)
         self.context.fastMouseChg = 1
-        accursed = self.context.c.getAccursed()
         self.context.setFastAnimation()
 
 class PanMover(Action, vob.mouse.RelativeAdapter, 
vob.mouse.MousePressListener):
     def pressed(self, x,y):
         return self
     def changedRelative(self, x,y='foo'):
-        main = self.context.main
-        f = main.getFocus()
+        f = self.context.main.getFocus()
         fX, fY = f.getPanX(), f.getPanY()
-        f.setPan(fX+x/f.zoom,
-                 fY+y/f.zoom)
-        main.chgFast(self.context.oldVS, -1)
+        f.setPan(fX-x/f.zoom,
+                 fY-y/f.zoom)
+        self.context.main.chgFast(self.context.oldVS, -1)
         self.context.setFastAnimation()
 
 class MMScene:
Index: fenfire/org/fenfire/fenmm/MMTextCursor.java
diff -u fenfire/org/fenfire/fenmm/MMTextCursor.java:1.2 
fenfire/org/fenfire/fenmm/MMTextCursor.java:1.3
--- fenfire/org/fenfire/fenmm/MMTextCursor.java:1.2     Sun Aug 24 05:19:57 2003
+++ fenfire/org/fenfire/fenmm/MMTextCursor.java Mon Aug 25 10:20:03 2003
@@ -9,7 +9,7 @@
 
 import org.nongnu.libvob.VobScene;
 import org.nongnu.libvob.TextStyle;
-import org.nongnu.libvob.vobs.LineVob;
+import org.nongnu.libvob.vobs.ContinuousLineVob;
 import org.fenfire.swamp.MultiplexerNodeFunction;
 
 import org.nongnu.libvob.lava.placeable.TextPlaceable;
@@ -164,7 +164,9 @@
                                      nodeXY[1] + cursorXY[1],
                                      1, -style.getHeight(scale));
        }
-       vs.put(new LineVob(0,0,0,1, color), cursorCS);
+
+       float points[] = {0,0,0,0,1,0};
+       vs.put(new ContinuousLineVob(2f, points, false, 100, color), cursorCS);
     }
 
     private int getLength() throws NotYetRenderedException {
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.39 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.40
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.39 Mon Aug 25 04:40:28 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Mon Aug 25 10:20:03 2003
@@ -157,12 +157,9 @@
                matchingParent, box2screen, box2plane):
         self.matchingParent = matchingParent
 
+       paper2box = vs.invertCS(box2plane, "minMap_INv")
        paper2screen = vs.concatCS(box2screen, 'mindMap_CONCAT',
-                                   box2plane)
-        box = jarray.zeros(2, 'f')
-        vs.coords.getSqSize(box2screen, box)
-       paper2screen = vs.translateCS(paper2screen, 'mindMap_TRANS',
-                                   box[0], box[1], 0)
+                                   paper2box)
         # XXX
         self.zoomPanCS = paper2screen
         




reply via email to

[Prev in Thread] Current Thread [Next in Thread]