[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java S...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java S... |
Date: |
Wed, 23 Apr 2003 15:34:20 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/23 15:34:20
Modified files:
org/fenfire/view: DefaultNodeView.java SimpleText.java
SpatialPlane.java TextHandler.java
TextState.java
Removed files:
org/fenfire/view: TextContentView.java
Log message:
fontsize
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/DefaultNodeView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SimpleText.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/SpatialPlane.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextHandler.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextState.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/view/DefaultNodeView.java
diff -u fenfire/org/fenfire/view/DefaultNodeView.java:1.4
fenfire/org/fenfire/view/DefaultNodeView.java:1.5
--- fenfire/org/fenfire/view/DefaultNodeView.java:1.4 Wed Apr 16 03:51:05 2003
+++ fenfire/org/fenfire/view/DefaultNodeView.java Wed Apr 23 15:34:20 2003
@@ -11,14 +11,14 @@
import java.awt.*;
public class DefaultNodeView extends NodeView {
-private static final String rcsid = "$Id: DefaultNodeView.java,v 1.4
2003/04/16 07:51:05 mudyc Exp $";
+private static final String rcsid = "$Id: DefaultNodeView.java,v 1.5
2003/04/23 19:34:20 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();
- page = new PageHandler() { };
+ page = new PageHandler() { };
}
public void place(Object node, VobScene vs, int box) {
Index: fenfire/org/fenfire/view/SimpleText.java
diff -u fenfire/org/fenfire/view/SimpleText.java:1.1
fenfire/org/fenfire/view/SimpleText.java:1.2
--- fenfire/org/fenfire/view/SimpleText.java:1.1 Tue Apr 8 10:56:52 2003
+++ fenfire/org/fenfire/view/SimpleText.java Wed Apr 23 15:34:20 2003
@@ -18,7 +18,7 @@
/** A cell content view showing a cell's text.
*/
public class SimpleText extends TextHandler {
-public static final String rcsid = "$Id: SimpleText.java,v 1.1 2003/04/08
14:56:52 mudyc Exp $";
+public static final String rcsid = "$Id: SimpleText.java,v 1.2 2003/04/23
19:34:20 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("SimpleText::"+s); }
@@ -41,19 +41,18 @@
super();
this.style = style;
this.widthString = widthString;
+ setFontSize(18);
+ setColor(java.awt.Color.black);
}
- public Color getColor() { return Color.black; }
- public void setColor(Color c) {; }
-
public void getSize(Enfilade1D enf, float[] size) {
String s;
if(enf != null)
s = enf.makeString();
else
s = widthString;
- size[0] = style.getWidth(s, 1);
- size[1] = style.getHeight(1);
+ size[0] = style.getWidth(s, fontSize);
+ size[1] = style.getHeight(fontSize);
}
float[] boxwh = new float[2];
Index: fenfire/org/fenfire/view/SpatialPlane.java
diff -u fenfire/org/fenfire/view/SpatialPlane.java:1.22
fenfire/org/fenfire/view/SpatialPlane.java:1.23
--- fenfire/org/fenfire/view/SpatialPlane.java:1.22 Wed Apr 23 13:15:37 2003
+++ fenfire/org/fenfire/view/SpatialPlane.java Wed Apr 23 15:34:20 2003
@@ -25,7 +25,7 @@
*/
public class SpatialPlane {
-public static final String rcsid = "$Id: SpatialPlane.java,v 1.22 2003/04/23
17:15:37 benja Exp $";
+public static final String rcsid = "$Id: SpatialPlane.java,v 1.23 2003/04/23
19:34:20 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,11 +154,10 @@
coords[0] = RDFUtil.getInt(fen, n, SPATIAL.coordX);
coords[1] = RDFUtil.getInt(fen, n, SPATIAL.coordY);
- nodeview.getSize(n, bs);
+ nodeview.getSize(n, bs, 5);
Pair matchKey = new Pair(container, n);
- float size = 20;
int box = vs.orthoBoxCS(into, matchKey, 0, coords[0], coords[1],
- size, size,
+ 1, 1,
bs[0], bs[1]);
nodeview.place(n, vs, box);
Index: fenfire/org/fenfire/view/TextHandler.java
diff -u fenfire/org/fenfire/view/TextHandler.java:1.1
fenfire/org/fenfire/view/TextHandler.java:1.2
--- fenfire/org/fenfire/view/TextHandler.java:1.1 Tue Apr 8 10:56:52 2003
+++ fenfire/org/fenfire/view/TextHandler.java Wed Apr 23 15:34:20 2003
@@ -17,4 +17,7 @@
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; }
}
Index: fenfire/org/fenfire/view/TextState.java
diff -u fenfire/org/fenfire/view/TextState.java:1.1
fenfire/org/fenfire/view/TextState.java:1.2
--- fenfire/org/fenfire/view/TextState.java:1.1 Tue Apr 8 10:56:52 2003
+++ fenfire/org/fenfire/view/TextState.java Wed Apr 23 15:34:20 2003
@@ -9,6 +9,8 @@
Color getColor();
// font
+ float getFontSize();
+ void setFontSize(float size);
//void setFont(Style style);
//Style getFont();
}
- [Gzz-commits] fenfire/org/fenfire/view DefaultNodeView.java S...,
Matti Katila <=