Revision: 20922
http://sourceforge.net/p/jmol/code/20922
Author: hansonr
Date: 2016-01-05 03:07:48 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.4.1_2016.01.04"
bug fix: (JvxlReader) Jmol 12 mapped isosurface jvxl files do not show mapped
color
bug fix: setting cartoons on for phosphorus-only polymers fails
bug fix: setting default label properties using select none;.... fails
bug fix: undocumented model-based draw [array of points] broken
-- points only
-- selects from visible frames (frame *, for example)
-- load cyclohexane_movie.xyz; frame *; draw @{{C5}.split().sub({1,0,0})
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/shapespecial/Draw.java
trunk/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
Modified: trunk/Jmol/src/org/jmol/shapespecial/Draw.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2016-01-05 03:07:31 UTC
(rev 20921)
+++ trunk/Jmol/src/org/jmol/shapespecial/Draw.java 2016-01-05 03:07:48 UTC
(rev 20922)
@@ -618,6 +618,7 @@
|| indicatedModelIndex < 0
&& (isFixed || isArrow || isCurve || isCircle || isCylinder ||
modelCount == 1)) {
// make just ONE copy
+
// arrows and curves simply can't be handled as
// multiple frames yet
thisMesh.modelIndex = (lineData == null ? vwr.am.cmi
Modified: trunk/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java 2016-01-05
03:07:31 UTC (rev 20921)
+++ trunk/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java 2016-01-05
03:07:48 UTC (rev 20922)
@@ -683,7 +683,8 @@
colix = C.ORANGE;
colix = C.getColixTranslucent3(colix, jvxlData.translucency != 0,
jvxlData.translucency);
- float translucencyLevel = (jvxlData.translucency == 0 ? Float.NaN :
jvxlData.translucency);
+ float translucencyLevel = (jvxlData.translucency == 0 ? Float.NaN
+ : jvxlData.translucency);
if (jvxlData.meshColor != null)
meshColix = C.getColixS(jvxlData.meshColor);
setJvxlDataRendering();
@@ -692,32 +693,32 @@
&& jvxlData.vertexColorMap == null;
if (colorEncoder == null)
return false;
- // bicolor map will be taken care of with params.isBicolorMap
- if (jvxlData.vertexColorMap == null) {
- if (jvxlData.colorScheme != null) {
- String colorScheme = jvxlData.colorScheme;
- boolean isTranslucent = colorScheme.startsWith("translucent ");
- if (isTranslucent) {
- colorScheme = colorScheme.substring(12);
- translucencyLevel = Float.NaN;
- }
- colorEncoder.setColorScheme(colorScheme, isTranslucent);
- remapColors(null, null, translucencyLevel);
+ // bicolor map will be taken care of with params.isBicolorMap
+ if (jvxlData.vertexColorMap == null) {
+ if (jvxlData.colorScheme != null) {
+ String colorScheme = jvxlData.colorScheme;
+ boolean isTranslucent = colorScheme.startsWith("translucent ");
+ if (isTranslucent) {
+ colorScheme = colorScheme.substring(12);
+ translucencyLevel = Float.NaN;
}
- } else {
- if (jvxlData.baseColor != null) {
- for (int i = vc; --i >= 0;)
- vcs[i] = colix;
- }
- for (Map.Entry<String, BS> entry : jvxlData.vertexColorMap.entrySet())
{
- BS bsMap = entry.getValue();
- short colix = C.copyColixTranslucency(this.colix, C.getColixS(entry
- .getKey()));
- for (int i = bsMap.nextSetBit(0); i >= 0; i = bsMap.nextSetBit(i +
1))
- vcs[i] = colix;
- }
+ colorEncoder.setColorScheme(colorScheme, isTranslucent);
+ remapColors(null, null, translucencyLevel);
}
- return true;
+ } else {
+ if (jvxlData.baseColor != null) {
+ for (int i = vc; --i >= 0;)
+ vcs[i] = colix;
+ }
+ for (Map.Entry<String, BS> entry : jvxlData.vertexColorMap.entrySet()) {
+ BS bsMap = entry.getValue();
+ short colix = C.copyColixTranslucency(this.colix,
+ C.getColixS(entry.getKey()));
+ for (int i = bsMap.nextSetBit(0); i >= 0; i = bsMap.nextSetBit(i + 1))
+ vcs[i] = colix;
+ }
+ }
+ return true;
}
void setJvxlDataRendering() {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
