Revision: 18649
http://sourceforge.net/p/jmol/code/18649
Author: hansonr
Date: 2013-09-09 14:36:50 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
___JmolVersion="13.3.6"
new feature: set drawFontSize // defaults to 14.0
Modified Paths:
--------------
trunk/Jmol/appletweb/jsmol.zip
trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
trunk/Jmol/src/org/jmol/script/T.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/StateManager.java
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/appletweb/jsmol.zip
===================================================================
(Binary files differ)
Modified: trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2013-09-07
22:44:25 UTC (rev 18648)
+++ trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2013-09-09
14:36:50 UTC (rev 18649)
@@ -473,7 +473,10 @@
for (int i = dmesh.polygonCount; --i >= 0;)
if (isPolygonDisplayable(i)) {
//just the first line of the title -- nothing fancy here.
- byte fid = g3d.getFontFid(14 * imageFontScaling);
+ float size = viewer.getFloat(T.drawfontsize);
+ if (size <= 0)
+ size = 14;
+ byte fid = g3d.getFontFid(size * imageFontScaling);
g3d.setFontFid(fid);
String s = mesh.title[i < mesh.title.length ? i : mesh.title.length -
1];
int pt = 0;
Modified: trunk/Jmol/src/org/jmol/script/T.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/T.java 2013-09-07 22:44:25 UTC (rev
18648)
+++ trunk/Jmol/src/org/jmol/script/T.java 2013-09-09 14:36:50 UTC (rev
18649)
@@ -844,7 +844,8 @@
public final static int cameradepth = floatparam | 6;
public final static int defaultdrawarrowscale = floatparam | 8;
public final static int defaulttranslucent = floatparam | 10;
- public final static int dipolescale = floatparam | 12;
+ public final static int dipolescale = floatparam | 11;
+ public final static int drawfontsize = floatparam | 12;
public final static int ellipsoidaxisdiameter = floatparam | 13;
public final static int exportscale = floatparam | 14;
public final static int gestureswipefactor = floatparam | 15;
@@ -2210,6 +2211,7 @@
"defaults", T.t(defaults),
"defaultTorsionLabel", T.t(defaulttorsionlabel),
"defaultVDW", T.t(defaultvdw),
+ "drawFontSize", T.t(drawfontsize),
"edsUrlCutoff", T.t(edsurlcutoff),
"edsUrlFormat", T.t(edsurlformat),
"energyUnits", T.t(energyunits),
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-09-07 22:44:25 UTC
(rev 18648)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-09-09 14:36:50 UTC
(rev 18649)
@@ -11,8 +11,10 @@
# The quotes above look odd for a parameter file, but they are
# important for the JavaScript version of Jmol.
-___JmolVersion="13.3.5"
+___JmolVersion="13.3.6"
+new feature: set drawFontSize // defaults to 14.0
+
JmolVersion="13.3.5_dev_2013.09.06"
new feature: show NMR taps into NMRDB directly
Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-09-07 22:44:25 UTC
(rev 18648)
+++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2013-09-09 14:36:50 UTC
(rev 18649)
@@ -851,6 +851,7 @@
setB("dotSurface", dotSurface);
setB("dragSelected", dragSelected);
setB("drawHover", drawHover);
+ setF("drawFontSize", drawFontSize);
setB("drawPicking", drawPicking);
setB("dsspCalculateHydrogenAlways", dsspCalcHydrogen);
setB("dynamicMeasurements", dynamicMeasurements);
@@ -1180,6 +1181,7 @@
float defaultTranslucent = 0.5f;
int delayMaximumMs = 0;
float dipoleScale = 1f;
+ float drawFontSize = 14f;
boolean disablePopupMenu = false;
boolean dragSelected = false;
boolean drawHover = false;
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-09-07 22:44:25 UTC (rev
18648)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-09-09 14:36:50 UTC (rev
18649)
@@ -5969,6 +5969,8 @@
return global.defaultDrawArrowScale;
case T.dipolescale:
return global.dipoleScale;
+ case T.drawfontsize:
+ return global.drawFontSize;
case T.exportscale:
return global.exportScale;
case T.hbondsangleminimum:
@@ -6249,6 +6251,10 @@
private void setFloatPropertyTok(String key, int tok, float value) {
switch (tok) {
+ case T.drawfontsize:
+ // 13.3.6
+ global.drawFontSize = value;
+ break;
case T.exportscale:
// 13.1.19
global.exportScale = value;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
