From: <ha...@us...> - 2011-06-06 02:46:04
|
Revision: 15529 http://jmol.svn.sourceforge.net/jmol/?rev=15529&view=rev Author: hansonr Date: 2011-06-06 02:45:58 +0000 (Mon, 06 Jun 2011) Log Message: ----------- # bug fix: font labels 16 bold does not work (i.e. missing face) Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/g3d/Font3D.java branches/v12_0/Jmol/src/org/jmol/g3d/Graphics3D.java branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java branches/v12_0/Jmol/src/org/jmol/shape/Mesh.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/g3d/Font3D.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/g3d/Font3D.java 2011-06-06 02:45:15 UTC (rev 15528) +++ branches/v12_0/Jmol/src/org/jmol/g3d/Font3D.java 2011-06-06 02:45:58 UTC (rev 15529) @@ -156,7 +156,7 @@ public static int getFontStyleID(String fontstyle) { int i = 4; - while (--i > 0) + while (--i >= 0) if (fontStyles[i].equalsIgnoreCase(fontstyle)) break; return i; Modified: branches/v12_0/Jmol/src/org/jmol/g3d/Graphics3D.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/g3d/Graphics3D.java 2011-06-06 02:45:15 UTC (rev 15528) +++ branches/v12_0/Jmol/src/org/jmol/g3d/Graphics3D.java 2011-06-06 02:45:58 UTC (rev 15529) @@ -2460,10 +2460,18 @@ Font3D.FONT_STYLE_PLAIN, fontSize, fontSize, platform); } + // {"Plain", "Bold", "Italic", "BoldItalic"}; + public static int getFontStyleID(String fontStyle) { + return Font3D.getFontStyleID(fontStyle); + } + public Font3D getFont3D(String fontFace, String fontStyle, float fontSize) { + int iStyle = Font3D.getFontStyleID(fontStyle); + if (iStyle < 0) + iStyle = 0; return Font3D.getFont3D(Font3D.getFontFaceID(fontFace), - Font3D.getFontStyleID(fontStyle), fontSize, fontSize, platform); + iStyle, fontSize, fontSize, platform); } public Font3D getFont3DScaled(Font3D font, float scale) { Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-06-06 02:45:15 UTC (rev 15528) +++ branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2011-06-06 02:45:58 UTC (rev 15529) @@ -11538,6 +11538,10 @@ } if (isSyntaxCheck) return; + if (Graphics3D.getFontStyleID(fontface) >= 0) { + fontstyle = fontface; + fontface = "SansSerif"; + } Font3D font3d = viewer.getFont3D(fontface, fontstyle, fontsize); loadShape(shapeType); setShapeProperty(shapeType, "font", font3d); Modified: branches/v12_0/Jmol/src/org/jmol/shape/Mesh.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/shape/Mesh.java 2011-06-06 02:45:15 UTC (rev 15528) +++ branches/v12_0/Jmol/src/org/jmol/shape/Mesh.java 2011-06-06 02:45:58 UTC (rev 15529) @@ -165,11 +165,11 @@ } public void setLighting(int lighting) { + isTwoSided = (lighting == JmolConstants.FULLYLIT); if (lighting == this.lighting) return; flipLighting(this.lighting); flipLighting(this.lighting = lighting); - isTwoSided = (lighting == JmolConstants.FULLYLIT); } private void flipLighting(int lighting) { Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-06-06 02:45:15 UTC (rev 15528) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-06-06 02:45:58 UTC (rev 15529) @@ -4,6 +4,8 @@ version=12.0.45_dev +# bug fix: font labels 16 bold does not work (i.e. missing face) + # -------------------------------------------------------------- #version=12.0.44 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |