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

[Asko Soukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/08/27 14:46:34

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

Log message:
        fix centered nodes in buffer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/mm.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMTextCursor.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/mindMapView2D.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/mm.py
diff -u fenfire/org/fenfire/demo/mm.py:1.50 fenfire/org/fenfire/demo/mm.py:1.51
--- fenfire/org/fenfire/demo/mm.py:1.50 Wed Aug 27 14:03:46 2003
+++ fenfire/org/fenfire/demo/mm.py      Wed Aug 27 14:46:34 2003
@@ -457,17 +457,17 @@
 
         vs.put(background(self.context.bgcolor))
         dimensions = w.getSize()
-        cs = vs.orthoBoxCS(0, "foo",0, 0,0, 1,1, dimensions.width, 
dimensions.height)
+        cs = vs.orthoBoxCS(0, "FenMM",0, 0,0, 1,1, dimensions.width, 
dimensions.height)
         self.main.renderMain(vs, cs)
 
         # draw cursor
         if accursed:
             nodeview = ff.view.TextNodeView(fen.txtfunc, style, 250.)
-            if structLink.isLinked(accursed) or self.context.main.getPlane() 
== accursed:
-                if hasattr(self.view, "zoomPanCS"):
-                    self.context.c.render(vs, cs, self.view.zoomPanCS, 
nodeview.f(fen.graph, accursed))
-                else: self.context.c.render(vs, cs, nodeview.f(fen.graph, 
accursed))
-            else: self.context.c.render(vs, cs, nodeview.f(fen.graph, 
accursed))
+            if hasattr(self.view, "zoomPanCS") \
+               and (structLink.isLinked(accursed) or 
self.context.main.getPlane() == accursed):
+                    self.context.c.render(vs, self.view.zoomPanCS, cs, 
nodeview.f(fen.graph, accursed))
+            else:
+                self.context.c.render(vs, cs, cs, vs.matcher.getCS(cs, 
accursed), nodeview.f(fen.graph, accursed))
 
         if self.startup: w.setCursor('default'); self.startup = 0
 
Index: fenfire/org/fenfire/fenmm/MMTextCursor.java
diff -u fenfire/org/fenfire/fenmm/MMTextCursor.java:1.4 
fenfire/org/fenfire/fenmm/MMTextCursor.java:1.5
--- fenfire/org/fenfire/fenmm/MMTextCursor.java:1.4     Tue Aug 26 05:40:36 2003
+++ fenfire/org/fenfire/fenmm/MMTextCursor.java Wed Aug 27 14:46:34 2003
@@ -127,33 +127,33 @@
        this.length = 0;
     }
 
-    public void render(VobScene vs, int into, TextPlaceable p) {
-       render(vs, into, 0, p);
+    public void render(VobScene vs, int into, int matchCS, TextPlaceable p) {
+       render(vs, into, matchCS, -1, p);
     }
-    public void render(VobScene vs, int matchCS, int zoomPanCS, TextPlaceable 
p) {
+    public void render(VobScene vs, int into, int matchCS, int matchParentCS, 
TextPlaceable p) {
        setTextPlaceable(p);
 
        float cursorXY[] = new float[2];
         this.p.getCursorXY(offset, cursorXY);
 
-        int nodeCS;
-       int cursorCS;
-       if (zoomPanCS > 0) {
-           cursorCS = vs.coords.ortho(zoomPanCS, -1000,
-                                          -p.getWidth()/2 + cursorXY[0],
-                                          -p.getHeight()/2 + cursorXY[1],
-                                          1, -style.getHeight(scale));
+        int nodeCS = 0;
+       int cursorCS = 0;
+       if (matchParentCS == -1) {
+           cursorCS = vs.coords.ortho(into, -1000,
+                                      -p.getWidth()/2 + cursorXY[0],
+                                      -p.getHeight()/2 + cursorXY[1],
+                                      1, -style.getHeight(scale));
            vs.matcher.add(matchCS, cursorCS, "CURSOR");
        } else {
-           if (matchCS > 0) nodeCS = vs.matcher.getCS(matchCS, accursed);
-           else nodeCS = vs.matcher.getCS(accursed);
+           nodeCS = vs.matcher.getCS(matchParentCS, accursed);
            float nodeXY[] = {0f, 0f, 0f};
            vs.coords.transformPoints3(nodeCS, nodeXY, nodeXY);
         
-           cursorCS = vs.orthoCS(matchCS, "CURSOR", -1000,
+           cursorCS = vs.coords.ortho(into, -1000,
                                      nodeXY[0] + cursorXY[0],
                                      nodeXY[1] + cursorXY[1],
                                      1, -style.getHeight(scale));
+           vs.matcher.add(matchCS, cursorCS, "CURSOR");
        }
 
        float points[] = {0,0,0,0,1,0};
Index: fenfire/org/fenfire/view/lava/mindMapView2D.py
diff -u fenfire/org/fenfire/view/lava/mindMapView2D.py:1.50 
fenfire/org/fenfire/view/lava/mindMapView2D.py:1.51
--- fenfire/org/fenfire/view/lava/mindMapView2D.py:1.50 Wed Aug 27 12:25:15 2003
+++ fenfire/org/fenfire/view/lava/mindMapView2D.py      Wed Aug 27 14:46:34 2003
@@ -118,14 +118,15 @@
         x = r * Math.cos(angle) + x0
         y = -r * Math.sin(angle) + y0
          
-        cs = vs.orthoBoxCS(into, node, -100, x-bx/2,y-by/2, 1,1, bx,by)
+        cs = vs.orthoBoxCS(into, "PRE_"+node, -100, x-bx/2,y-by/2, 1,1, bx,by)
         return cs
 
-    def place(self, vs, node, cs):
+    def place(self, vs, node, into):
         p = self.multiplexer.f(self.fen.graph, node)
         x = - p.getWidth()/2.
         y = - p.getHeight()/2.
-        cs = vs.orthoBoxCS(cs,node,0, x, y, 1,1, p.getWidth(), p.getHeight())
+        vs.matcher.add(self.floatingView.matchingParent, into, node)
+        cs = vs.orthoBoxCS(into,node,0, x, y, 1,1, p.getWidth(), p.getHeight())
         p.place(vs, cs)
         vs.coords.activate(cs)