Revision: 20340
http://sourceforge.net/p/jmol/code/20340
Author: hansonr
Date: 2015-02-26 15:45:30 +0000 (Thu, 26 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.12_2015.02.26"
bug fix: imageFontScaling integer instead of float; does not scale
appropriately on resize
bug fix: writing image of MO fails to write info (Jmol 12 or before)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java
trunk/Jmol/src/org/jmol/render/AxesRenderer.java
trunk/Jmol/src/org/jmol/render/CageRenderer.java
trunk/Jmol/src/org/jmol/render/EchoRenderer.java
trunk/Jmol/src/org/jmol/render/FrankRenderer.java
trunk/Jmol/src/org/jmol/render/LabelsRenderer.java
trunk/Jmol/src/org/jmol/render/MeasuresRenderer.java
trunk/Jmol/src/org/jmol/render/UccageRenderer.java
trunk/Jmol/src/org/jmol/rendercgo/CGORenderer.java
trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
trunk/Jmol/src/org/jmol/rendersurface/MolecularOrbitalRenderer.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java 2015-02-26
15:45:07 UTC (rev 20339)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java 2015-02-26
15:45:30 UTC (rev 20340)
@@ -233,6 +233,8 @@
|| param3 < 0);
params.isBicolorMap = (param1 > 0 && param2 < 0);
jvxlDataIsColorMapped = (param3 != 0);
+ if (jvxlDataIsColorMapped)
+ jvxlData.colorScheme = "RGB"; // legacy
jvxlDataIs2dContour = (jvxlDataIsColorMapped && params.isContoured);
if (params.isBicolorMap || params.colorBySign)
Modified: trunk/Jmol/src/org/jmol/render/AxesRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/AxesRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/AxesRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -68,7 +68,7 @@
boolean isXY = (axes.axisXY.z != 0);
if (!isXY && tm.isNavigating() && vwr.getBoolean(T.navigationperiodic))
return false;
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
if (vwr.areAxesTainted()) {
Font f = axes.font3d;
axes.initShape();
Modified: trunk/Jmol/src/org/jmol/render/CageRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/CageRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/CageRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -53,7 +53,7 @@
//clearBox();
g3d.setC(colix);
FontLineShape fls = (FontLineShape) shape;
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
font3d = vwr.gdata.getFont3DScaled(fls.font3d, imageFontScaling);
float zSum = 0;
Modified: trunk/Jmol/src/org/jmol/render/EchoRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/EchoRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/EchoRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -40,7 +40,7 @@
Echo echo = (Echo) shape;
float scalePixelsPerMicron = (vwr.getBoolean(T.fontscaling) ? vwr
.getScalePixelsPerAngstrom(true) * 10000 : 0);
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
boolean haveTranslucent = false;
setZcutoff();
for (Text t: echo.objects.values()) {
Modified: trunk/Jmol/src/org/jmol/render/FrankRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/FrankRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/FrankRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -45,7 +45,7 @@
if (!g3d.setC(C.getColixTranslucent3(colix,
g3d.haveTranslucentObjects(), 0.5f)))
return true;
- float imageFontScaling = vwr.getImageFontScaling();
+ float imageFontScaling = vwr.imageFontScaling;
frank.getFont(imageFontScaling);
int dx = (int) (frank.frankWidth + Frank.frankMargin * imageFontScaling);
int dy = frank.frankDescent;
Modified: trunk/Jmol/src/org/jmol/render/LabelsRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/LabelsRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/LabelsRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -94,7 +94,7 @@
sppm = vwr.getScalePixelsPerAngstrom(true);
scalePixelsPerMicron = (vwr.getBoolean(T.fontscaling) ? sppm * 10000f
: 0);
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
int iGroup = -1;
minZ[0] = Integer.MAX_VALUE;
boolean isAntialiased = g3d.isAntialiased();
Modified: trunk/Jmol/src/org/jmol/render/MeasuresRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/MeasuresRenderer.java 2015-02-26
15:45:07 UTC (rev 20339)
+++ trunk/Jmol/src/org/jmol/render/MeasuresRenderer.java 2015-02-26
15:45:30 UTC (rev 20340)
@@ -81,7 +81,7 @@
doJustify = vwr.getBoolean(T.justifymeasurements);
modulating = ms.bsModulated != null;
// note that this COULD be screen pixels if <= 20.
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
mad0 = measures.mad;
font3d =vwr.gdata.getFont3DScaled(measures.font3d, imageFontScaling);
m = measures.mPending;
Modified: trunk/Jmol/src/org/jmol/render/UccageRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -53,7 +53,7 @@
@Override
protected boolean render() {
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
font3d = vwr.gdata.getFont3DScaled(((Uccage) shape).font3d,
imageFontScaling);
int mad = vwr.getObjectMad(StateManager.OBJ_UNITCELL);
if (mad == 0 || vwr.isJmolDataFrame() || tm.isNavigating()
Modified: trunk/Jmol/src/org/jmol/rendercgo/CGORenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/rendercgo/CGORenderer.java 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/rendercgo/CGORenderer.java 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -66,7 +66,7 @@
@Override
protected boolean render() {
needTranslucent = false;
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
CGO cgo = (CGO) shape;
for (int i = cgo.meshCount; --i >= 0;)
renderMesh(cgoMesh = (CGOMesh) cgo.meshes[i]);
Modified: trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2015-02-26
15:45:07 UTC (rev 20339)
+++ trunk/Jmol/src/org/jmol/renderspecial/DrawRenderer.java 2015-02-26
15:45:30 UTC (rev 20340)
@@ -67,7 +67,7 @@
*
*/
needTranslucent = false;
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
Draw draw = (Draw) shape;
for (int i = draw.meshCount; --i >= 0;)
if (renderMesh(dmesh = (DrawMesh) draw.meshes[i]))
Modified: trunk/Jmol/src/org/jmol/rendersurface/MolecularOrbitalRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/rendersurface/MolecularOrbitalRenderer.java
2015-02-26 15:45:07 UTC (rev 20339)
+++ trunk/Jmol/src/org/jmol/rendersurface/MolecularOrbitalRenderer.java
2015-02-26 15:45:30 UTC (rev 20340)
@@ -30,7 +30,7 @@
@Override
protected boolean render() {
- imageFontScaling = vwr.getImageFontScaling();
+ imageFontScaling = vwr.imageFontScaling;
renderIso();
return needTranslucent;
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-26 15:45:07 UTC
(rev 20339)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-26 15:45:30 UTC
(rev 20340)
@@ -14,8 +14,9 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.2.12_2015.02.26"
+Jmol.___JmolVersion="14.3.12_2015.02.26"
+bug fix: imageFontScaling integer instead of float; does not scale
appropriately on resize
bug fix: writing image of MO fails to write info (Jmol 12 or before)
JmolVersion="14.3.12_2015.02.25c"
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-02-26 15:45:07 UTC (rev
20339)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-02-26 15:45:30 UTC (rev
20340)
@@ -3302,8 +3302,6 @@
resizeImage(width, height, false, false, true);
}
- private float imageFontScaling = 1;
-
/**
* A graphics from a "slave" stereo display that has been synchronized with
* this this applet.
@@ -3323,9 +3321,7 @@
this.gRight = gRight;
}
- public float getImageFontScaling() {
- return imageFontScaling;
- }
+ public float imageFontScaling = 1;
void resizeImage(int width, int height, boolean isImageWrite,
boolean isExport, boolean isReset) {
@@ -3337,7 +3333,7 @@
&& checkMotionRendering(T.antialiasdisplay)
: isImageWrite && !isExport ? g.antialiasImages : false);
imageFontScaling = (isReset || width <= 0 ? 1
- : (antialiased ? 2 : 1) * (g.zoomLarge == (height > width) ? height :
width) / getScreenDim());
+ : (antialiased ? 2f : 1f) * (g.zoomLarge == (height > width) ? height
: width) / getScreenDim());
if (width > 0) {
dimScreen.width = width;
dimScreen.height = height;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
