[Gzz-commits] fenfire/org/fenfire demo/fenpdfcontext.py view/...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/30 11:04:22

Modified files:
        org/fenfire/demo: fenpdfcontext.py 
        org/fenfire/view: TextNodeView.java 
        org/fenfire/view/buoy: AbstractNodeType2D.java 
        org/fenfire/view/lava: TextHandler.java 

Log message:
        cleaning + anchor fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/lava/TextHandler.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.12 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.13
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.12      Sat Jul 19 08:55:10 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Wed Jul 30 11:04:21 2003
@@ -203,6 +203,7 @@
 
 class Context(ff.view.lava.ContextNodeView.Context,
               ff.view.buoy.AbstractMainNode2D.Render,
+              ff.view.lava.TextHandler.Context,
               ff.view.lava.FenPDFContext,
               SuperCaller):
     def __init__(self, win, fen, pp, nv, ctrl, spanImageFactory):
@@ -257,7 +258,7 @@
             nv.setCached()
 
     # /** call back from TextNodeView */
-    def isToBePlaced(self, node, text):
+    def toBePlaced(self, node, text):
         if dbg: p("n"+node+" == ")
         if self.states.cursor.isAccursed(node):
            text.setColor(java.awt.Color.red)
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.10 
fenfire/org/fenfire/view/TextNodeView.java:1.11
--- fenfire/org/fenfire/view/TextNodeView.java:1.10     Mon Jul 28 04:22:32 2003
+++ fenfire/org/fenfire/view/TextNodeView.java  Wed Jul 30 11:04:21 2003
@@ -39,7 +39,7 @@
  */
 public class TextNodeView extends org.fenfire.view.lava.TextHandler 
        implements NodeFunction {
-public static final String rcsid = "$Id: TextNodeView.java,v 1.10 2003/07/28 
08:22:32 tjl Exp $";
+public static final String rcsid = "$Id: TextNodeView.java,v 1.11 2003/07/30 
15:04:21 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("TextNodeView::"+s); 
}
 
@@ -60,14 +60,14 @@
     private boolean hasContext = true;
     public void setHasNoContext() { hasContext = false; }
 
-    private org.fenfire.view.lava.FenPDFContext context = null;
-    public void setContext(org.fenfire.view.lava.FenPDFContext context) 
+    private org.fenfire.view.lava.TextHandler.Context context = null;
+    public void setContext(org.fenfire.view.lava.TextHandler.Context context) 
     { this.context = context; }
 
     public Object f(ConstGraph g, Object node) {
         if (hasContext) {
             if (context == null) throw new Error("No context set");
-            context.isToBePlaced(node, this);
+            context.toBePlaced(node, this);
         }
 
        Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
Index: fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.5 
fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.6
--- fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java:1.5   Wed Jul 30 
05:11:46 2003
+++ fenfire/org/fenfire/view/buoy/AbstractNodeType2D.java       Wed Jul 30 
11:04:22 2003
@@ -50,12 +50,9 @@
 
     public BuoyViewMainNode createMainNode(Object linkId, 
                                           Object anchor) {
-       Triple t = (Triple)anchor;
-       Object plane = t.first;
-       Rectangle rect = (Rectangle)t.second;
-
-       return mainNodeFactory.create(plane, view2d,
-                             rect.x+rect.width/2f,
-                             rect.y+rect.height/2f);
+       View2D.Anchor a = (View2D.Anchor)anchor;
+       return mainNodeFactory.create(a.plane, view2d,
+                                     a.x+a.w/2f,
+                                     a.y+a.h/2f);
     }
 }
Index: fenfire/org/fenfire/view/lava/TextHandler.java
diff -u fenfire/org/fenfire/view/lava/TextHandler.java:1.3 
fenfire/org/fenfire/view/lava/TextHandler.java:1.4
--- fenfire/org/fenfire/view/lava/TextHandler.java:1.3  Sat Jun 14 17:08:24 2003
+++ fenfire/org/fenfire/view/lava/TextHandler.java      Wed Jul 30 11:04:22 2003
@@ -33,6 +33,10 @@
 
 public abstract class TextHandler { //implements TextState, TextContext {
 
+    public interface Context {
+       void toBePlaced(Object node, TextHandler handler);
+    }
+
     public TextHandler() {
        setColor(java.awt.Color.black);
        setScale(1);
@@ -40,7 +44,7 @@
        //setStyle(GraphicsAPI.getInstance().getTextStyle("sans", 0, 24));
     }
 
-
+    
     protected Color color;
     public Color getColor() { return color; }
     public void setColor(Color c) { color = c; }