Menu
▾
▴
[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/datamodel Axes.java,1.15,1.16 AxesRenderer.java,1.10,1.11 Bbcage.java,1.2,1.3 Echo.java,1.5,1.6 FrameRenderer.java,1.38,1.39 Frank.java,1.5,1.6 FrankRenderer.java,1.4,1.5 LabelsRenderer.java,1.6,1.7 MeasuresRenderer.java,1.5,1.6
|
From: Michael T H. <mic...@us...> - 2004-03-15 21:47:43
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11665/src/org/openscience/jmol/viewer/datamodel Modified Files: Axes.java AxesRenderer.java Bbcage.java Echo.java FrameRenderer.java Frank.java FrankRenderer.java LabelsRenderer.java MeasuresRenderer.java Log Message: part of conversion to provide better font support Index: Axes.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Axes.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Axes.java 21 Feb 2004 22:21:06 -0000 1.15 +++ Axes.java 15 Mar 2004 21:38:28 -0000 1.16 @@ -27,8 +27,6 @@ import org.openscience.jmol.viewer.*; import org.openscience.jmol.viewer.g3d.Graphics3D; -import java.awt.Font; -import java.awt.FontMetrics; import javax.vecmath.Point3f; import javax.vecmath.Vector3f; import javax.vecmath.Point3i; Index: AxesRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/AxesRenderer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- AxesRenderer.java 21 Feb 2004 09:20:15 -0000 1.10 +++ AxesRenderer.java 15 Mar 2004 21:38:28 -0000 1.11 @@ -28,8 +28,6 @@ import org.openscience.jmol.viewer.g3d.Graphics3D; import java.awt.Rectangle; -import java.awt.Font; -import java.awt.FontMetrics; import javax.vecmath.Point3f; import javax.vecmath.Point3i; Index: Bbcage.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Bbcage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bbcage.java 21 Feb 2004 22:21:06 -0000 1.2 +++ Bbcage.java 15 Mar 2004 21:38:28 -0000 1.3 @@ -27,8 +27,6 @@ import org.openscience.jmol.viewer.*; import org.openscience.jmol.viewer.g3d.Graphics3D; -import java.awt.Font; -import java.awt.FontMetrics; import javax.vecmath.Point3f; import javax.vecmath.Vector3f; import javax.vecmath.Point3i; Index: Echo.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Echo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Echo.java 15 Mar 2004 18:32:38 -0000 1.5 +++ Echo.java 15 Mar 2004 21:38:28 -0000 1.6 @@ -27,6 +27,7 @@ import org.openscience.jmol.viewer.*; import org.openscience.jmol.viewer.g3d.Graphics3D; +import org.openscience.jmol.viewer.g3d.Font3D; import java.awt.Color; import java.awt.FontMetrics; @@ -66,7 +67,7 @@ if ("font".equals(propertyName)) { if (currentText != null) { - currentText.fontid = ((Byte)value).byteValue(); + currentText.font3d = (Font3D)value; currentText.recalc(); } return; @@ -91,7 +92,7 @@ if ("top".equals(target)) { if (topText == null) topText = new Text(TOP, CENTER, - g3d.getFontID(FONTSIZE, FONTFACE), COLOR); + g3d.getFont3D(FONTFACE, FONTSIZE), COLOR); currentText = topText; return; } @@ -99,7 +100,7 @@ if ("middle".equals(target)) { if (middleText == null) middleText = new Text(MIDDLE, CENTER, - g3d.getFontID(FONTSIZE, FONTFACE), COLOR); + g3d.getFont3D(FONTFACE, FONTSIZE), COLOR); currentText = middleText; return; } @@ -107,7 +108,7 @@ if ("bottom".equals(target)) { if (bottomText == null) bottomText = new Text(BOTTOM, LEFT, - g3d.getFontID(FONTSIZE, FONTFACE), COLOR); + g3d.getFont3D(FONTFACE, FONTSIZE), COLOR); currentText = bottomText; return; } @@ -147,17 +148,17 @@ String text; int align; int valign; - byte fontid; + Font3D font3d; short colix; int width; int ascent; int descent; - Text(int valign, int align, byte fontid, short colix) { + Text(int valign, int align, Font3D font3d, short colix) { this.align = align; this.valign = valign; - this.fontid = fontid; + this.font3d = font3d; this.colix = colix; } @@ -166,7 +167,7 @@ text = null; return; } - FontMetrics fm = g3d.getFontMetrics(fontid); + FontMetrics fm = font3d.fontMetrics; width = fm.stringWidth(text); descent = fm.getDescent(); ascent = fm.getAscent(); @@ -189,11 +190,7 @@ else y = g3d.height - descent - 1; - System.out.println("Echo.render fontid=" + fontid + - " fontsize=" + g3d.getFontSize(fontid) + - " fontface=" + g3d.getFontFaceString(fontid) + - " fontstyle=" + g3d.getFontStyleString(fontid)); - g3d.setFontID(fontid); + g3d.setFont3D(font3d); g3d.drawString(text, colix, x, y, 0); } } Index: FrameRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/FrameRenderer.java,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- FrameRenderer.java 14 Mar 2004 21:58:56 -0000 1.38 +++ FrameRenderer.java 15 Mar 2004 21:38:28 -0000 1.39 @@ -33,7 +33,6 @@ import java.util.BitSet; import java.awt.Rectangle; -import java.awt.Font; import java.awt.FontMetrics; public class FrameRenderer { Index: Frank.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Frank.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Frank.java 15 Mar 2004 15:55:59 -0000 1.5 +++ Frank.java 15 Mar 2004 21:38:28 -0000 1.6 @@ -25,7 +25,7 @@ package org.openscience.jmol.viewer.datamodel; import org.openscience.jmol.viewer.g3d.Graphics3D; -import java.awt.Font; +import org.openscience.jmol.viewer.g3d.Font3D; import java.awt.FontMetrics; public class Frank extends SelectionIndependentShape { @@ -36,7 +36,7 @@ final static int frankFontSize = 14; final static int frankMargin = 4; - byte frankFontID; + Font3D font3d; int frankWidth; int frankAscent; int frankDescent; @@ -46,8 +46,8 @@ colix = Graphics3D.GRAY; - frankFontID = g3d.getFontID(frankFontSize, frankFontName, frankFontStyle); - FontMetrics fm = g3d.getFontMetrics(frankFontID); + font3d = g3d.getFont3D(frankFontName, frankFontStyle, frankFontSize); + FontMetrics fm = font3d.fontMetrics; frankWidth = fm.stringWidth(frankString); frankDescent = fm.getDescent(); frankAscent = fm.getAscent(); Index: FrankRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/FrankRenderer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FrankRenderer.java 14 Mar 2004 21:58:56 -0000 1.4 +++ FrankRenderer.java 15 Mar 2004 21:38:28 -0000 1.5 @@ -27,8 +27,6 @@ import org.openscience.jmol.viewer.*; import org.openscience.jmol.viewer.g3d.Graphics3D; -import java.awt.Font; - class FrankRenderer extends ShapeRenderer { void render() { @@ -37,7 +35,7 @@ if (mad == 0) return; - g3d.setFontID(frank.frankFontID); + g3d.setFont3D(frank.font3d); g3d.drawString(frank.frankString, frank.colix, g3d.width - frank.frankWidth - frank.frankMargin, g3d.height - frank.frankDescent - frank.frankMargin, Index: LabelsRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/LabelsRenderer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- LabelsRenderer.java 14 Mar 2004 21:58:56 -0000 1.6 +++ LabelsRenderer.java 15 Mar 2004 21:38:28 -0000 1.7 @@ -27,17 +27,13 @@ import org.openscience.jmol.viewer.*; import org.openscience.jmol.viewer.g3d.Graphics3D; - -import java.awt.Font; -import java.awt.FontMetrics; - +import org.openscience.jmol.viewer.g3d.Font3D; class LabelsRenderer extends ShapeRenderer { // offsets are from the font baseline int fontSizePrevious = -1; - byte labelFontID; - FontMetrics labelFontMetrics; + Font3D font3d; void render() { fontSizePrevious = -1; @@ -64,9 +60,8 @@ ? JmolConstants.LABEL_DEFAULT_FONTSIZE : sizes[i]); if (fontSize != fontSizePrevious) { - byte fontID = labelFontID = g3d.getFontID(fontSize); - g3d.setFontID(fontID); - labelFontMetrics = g3d.getFontMetrics(); + g3d.setFontOfSize(fontSize); + font3d = g3d.getFont3D(); fontSizePrevious = fontSize; } short offset = offsets == null || i >= offsets.length ? 0 : offsets[i]; @@ -101,7 +96,7 @@ if (labelOffsetX > 0) { xOffset = labelOffsetX; } else { - xOffset = -labelFontMetrics.stringWidth(strLabel); + xOffset = -font3d.fontMetrics.stringWidth(strLabel); if (labelOffsetX == 0) xOffset /= 2; else @@ -111,7 +106,7 @@ if (labelOffsetY > 0) { yOffset = labelOffsetY; } else { - yOffset = -labelFontMetrics.getAscent(); + yOffset = -font3d.fontMetrics.getAscent(); if (labelOffsetY == 0) yOffset /= 2; else Index: MeasuresRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/MeasuresRenderer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MeasuresRenderer.java 15 Mar 2004 18:32:38 -0000 1.5 +++ MeasuresRenderer.java 15 Mar 2004 21:38:28 -0000 1.6 @@ -34,7 +34,6 @@ import javax.vecmath.Matrix3f; import javax.vecmath.AxisAngle4f; -import java.awt.Font; import java.awt.FontMetrics; class MeasuresRenderer extends ShapeRenderer { |