[Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java S...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/23 16:24:57

Modified files:
        org/fenfire/view: DefaultNodeView.java SpatialPlane.java 
                          TextHandler.java TextState.java 
Added files:
        org/fenfire/view: LinebrokenText.java 
Removed files:
        org/fenfire/view: SimpleText.java 

Log message:
        fix fontsize etc. seems to be quite beatiful!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/LinebrokenText.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextHandler.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextState.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/DefaultNodeView.java
diff -u fenfire/org/fenfire/view/DefaultNodeView.java:1.5 
fenfire/org/fenfire/view/DefaultNodeView.java:1.6
--- fenfire/org/fenfire/view/DefaultNodeView.java:1.5   Wed Apr 23 15:34:20 2003
+++ fenfire/org/fenfire/view/DefaultNodeView.java       Wed Apr 23 16:24:57 2003
@@ -11,13 +11,13 @@
 import java.awt.*;
 
 public class DefaultNodeView extends NodeView {
-private static final String rcsid = "$Id: DefaultNodeView.java,v 1.5 
2003/04/23 19:34:20 mudyc Exp $";  
+private static final String rcsid = "$Id: DefaultNodeView.java,v 1.6 
2003/04/23 20:24:57 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("DefaultNodeView::"+s); }
     
     public DefaultNodeView(Fen f) {
        fen = f;
-       text = new SimpleText();
+       text = new LinebrokenText();
        page = new PageHandler() { };
     }
 
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.23 
fenfire/org/fenfire/view/SpatialPlane.java:1.24
--- fenfire/org/fenfire/view/SpatialPlane.java:1.23     Wed Apr 23 15:34:20 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java  Wed Apr 23 16:24:57 2003
@@ -25,7 +25,7 @@
  */
 
 public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.23 2003/04/23 
19:34:20 mudyc Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.24 2003/04/23 
20:24:57 mudyc Exp $";
     public static boolean dbg = false;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { System.out.println("SpatialPlane::"+s); 
}
@@ -154,7 +154,7 @@
            coords[0] = RDFUtil.getInt(fen, n, SPATIAL.coordX);
            coords[1] = RDFUtil.getInt(fen, n, SPATIAL.coordY);
 
-           nodeview.getSize(n, bs, 5);
+           nodeview.getSize(n, bs);
            Pair matchKey = new Pair(container, n);
            int box = vs.orthoBoxCS(into, matchKey, 0, coords[0], coords[1], 
                        1, 1,
Index: fenfire/org/fenfire/view/TextHandler.java
diff -u fenfire/org/fenfire/view/TextHandler.java:1.2 
fenfire/org/fenfire/view/TextHandler.java:1.3
--- fenfire/org/fenfire/view/TextHandler.java:1.2       Wed Apr 23 15:34:20 2003
+++ fenfire/org/fenfire/view/TextHandler.java   Wed Apr 23 16:24:57 2003
@@ -6,18 +6,33 @@
 
 import org.nongnu.alph.*;
 import java.awt.Color;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 public abstract class TextHandler implements ContentHandler, TextState { //, 
TextContext
 
     public void place(VobScene vs, int box, Enfilade1D enf) {}
     public void getSize(Enfilade1D enf, float[] size) {}
 
+    public TextHandler() {
+       setColor(java.awt.Color.black);
+       setScale(1);
+       setCursorOffset(-1);
+       setStyle(GraphicsAPI.getInstance().getTextStyle("sans", 0, 24));
+    }
+
+
     protected Color color;
     public Color getColor() { return color; }
     public void setColor(Color c) { color = c; }
 
-    protected float fontSize;
-    public float getFontSize() { return fontSize; }
-    public void setFontSize(float size) { fontSize = size; }
+    protected float scale;
+    public float getScale() { return scale; }
+    public void setScale(float fontScale) { scale = fontScale; }
+
+    protected TextStyle style;
+    public void setStyle(TextStyle fontStyle) { style = fontStyle; }
+    public TextStyle getStyle() { return style; }
+
+    protected int cursorOffset;
+    public int getCursorOffset() { return cursorOffset; }
+    public void setCursorOffset(int offset) { cursorOffset = offset; }
 }
Index: fenfire/org/fenfire/view/TextState.java
diff -u fenfire/org/fenfire/view/TextState.java:1.2 
fenfire/org/fenfire/view/TextState.java:1.3
--- fenfire/org/fenfire/view/TextState.java:1.2 Wed Apr 23 15:34:20 2003
+++ fenfire/org/fenfire/view/TextState.java     Wed Apr 23 16:24:57 2003
@@ -1,6 +1,7 @@
 //(c): Matti J.Katila
 
 package org.fenfire.view;
+import org.nongnu.libvob.TextStyle;
 import java.awt.*;
 
 public interface TextState {
@@ -9,8 +10,9 @@
     Color getColor();
 
     // font
-    float getFontSize();
-    void setFontSize(float size);
-    //void setFont(Style style);
-    //Style getFont();
+    float getScale();
+    void setScale(float fontScale);
+
+    void setStyle(TextStyle style);
+    TextStyle getStyle();
 }