Revision: 21321
http://sourceforge.net/p/jmol/code/21321
Author: hansonr
Date: 2017-01-13 13:15:38 +0000 (Fri, 13 Jan 2017)
Log Message:
-----------
Jmol.___JmolVersion="14.8.1"
bug fix: isosurface color "user" as an equivalent to isosurface colorscheme
"user" broken
bug fix: color isosurface range 1 122 ignores preset isosurface color scheme
and just uses the default color scheme
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEval.java
trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2017-01-13 00:50:18 UTC
(rev 21320)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2017-01-13 13:15:38 UTC
(rev 21321)
@@ -8352,8 +8352,8 @@
if (chk)
return;
isColor = false;
- ColorEncoder ce = vwr.cm.getColorEncoder(scheme);
- if (ce == null)
+ ColorEncoder ce = (scheme == null ? (ColorEncoder)
getShapeProperty(shapeType, "colorEncoder") : null);
+ if (ce == null && (ce = vwr.cm.getColorEncoder(scheme)) == null)
return;
ce.isTranslucent = (isTranslucent && translucentLevel ==
Float.MAX_VALUE);
ce.setRange(min, max, min > max);
Modified: trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2017-01-13
00:50:18 UTC (rev 21320)
+++ trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2017-01-13
13:15:38 UTC (rev 21321)
@@ -947,6 +947,8 @@
if (property == "atoms") {
return thisMesh.surfaceAtoms;
}
+ if (property == "colorEncoder")
+ return thisMesh.colorEncoder;
return null;
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2017-01-13 00:50:18 UTC
(rev 21320)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2017-01-13 13:15:38 UTC
(rev 21321)
@@ -53,6 +53,7 @@
Jmol.___JmolVersion="14.8.1"
bug fix: isosurface color "user" as an equivalent to isosurface colorscheme
"user" broken
+bug fix: color isosurface range 1 122 ignores preset isosurface color scheme
and just uses the default color scheme
JmolVersion="14.8.0"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
