Revision: 20921
http://sourceforge.net/p/jmol/code/20921
Author: hansonr
Date: 2016-01-05 03:07:31 +0000 (Tue, 05 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/shape/MeshCollection.java
branches/v14_4/Jmol/src/org/jmol/shapecgo/CGO.java
branches/v14_4/Jmol/src/org/jmol/shapesurface/Isosurface.java
branches/v14_4/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
branches/v14_4/Jmol/src/org/jmol/shapesurface/MolecularOrbital.java
Modified: branches/v14_4/Jmol/src/org/jmol/shape/MeshCollection.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shape/MeshCollection.java 2016-01-05
02:34:29 UTC (rev 20920)
+++ branches/v14_4/Jmol/src/org/jmol/shape/MeshCollection.java 2016-01-05
03:07:31 UTC (rev 20921)
@@ -442,7 +442,7 @@
return list;
}
- protected Object getPropMC(String property) {
+ protected Object getPropMC(String property, int index) {
Mesh m;
if (property == "count") {
int n = 0;
Modified: branches/v14_4/Jmol/src/org/jmol/shapecgo/CGO.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shapecgo/CGO.java 2016-01-05 02:34:29 UTC
(rev 20920)
+++ branches/v14_4/Jmol/src/org/jmol/shapecgo/CGO.java 2016-01-05 03:07:31 UTC
(rev 20921)
@@ -147,7 +147,7 @@
public Object getProperty(String property, int index) {
if (property == "command")
return getCommand(cgoMesh);
- return getPropMC(property);
+ return getPropMC(property, index);
}
@Override
Modified: branches/v14_4/Jmol/src/org/jmol/shapesurface/Isosurface.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shapesurface/Isosurface.java
2016-01-05 02:34:29 UTC (rev 20920)
+++ branches/v14_4/Jmol/src/org/jmol/shapesurface/Isosurface.java
2016-01-05 03:07:31 UTC (rev 20921)
@@ -218,7 +218,7 @@
return;
String id = currentMesh.thisID;
int imodel = currentMesh.modelIndex;
- vwr.cachePut("cache://isosurface_" + id, getPropI("jvxlDataXml"));
+ vwr.cachePut("cache://isosurface_" + id, getPropI("jvxlDataXml", -1));
deleteMeshI(currentMesh.index);
setPropI("init", null, null);
setPropI("thisID", id, null);
@@ -845,11 +845,11 @@
@Override
public Object getProperty(String property, int index) {
- return getPropI(property);
+ return getPropI(property, index);
}
- protected Object getPropI(String property) {
- Object ret = getPropMC(property);
+ protected Object getPropI(String property, int index) {
+ Object ret = getPropMC(property, index);
if (ret != null)
return ret;
if (property == "message") {
@@ -859,8 +859,8 @@
if (jvxlData.dataMin != Float.MAX_VALUE)
s += " min=" + jvxlData.dataMin + " max=" + jvxlData.dataMax;
s += "; " + JC.shapeClassBases[shapeID].toLowerCase() + " count: "
- + getPropMC("count");
- return s + getPropI("dataRangeStr") + jvxlData.msg;
+ + getPropMC("count", index);
+ return s + getPropI("dataRangeStr", index) + jvxlData.msg;
}
if (property == "dataRange")
return getDataRange();
Modified: branches/v14_4/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
2016-01-05 02:34:29 UTC (rev 20920)
+++ branches/v14_4/Jmol/src/org/jmol/shapesurface/IsosurfaceMesh.java
2016-01-05 03:07:31 UTC (rev 20921)
@@ -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() {
Modified: branches/v14_4/Jmol/src/org/jmol/shapesurface/MolecularOrbital.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/shapesurface/MolecularOrbital.java
2016-01-05 02:34:29 UTC (rev 20920)
+++ branches/v14_4/Jmol/src/org/jmol/shapesurface/MolecularOrbital.java
2016-01-05 03:07:31 UTC (rev 20921)
@@ -312,11 +312,11 @@
@SuppressWarnings("unchecked")
@Override
- public Object getProperty(String propertyName, int param) {
+ public Object getProperty(String propertyName, int index) {
if (propertyName.startsWith("list")) {
String s = "";
if (propertyName.equals("list")) {
- s = (String) getPropI("list");
+ s = (String) getPropI("list", index);
if (s.length() > 1)
s += "cutoff = " + jvxlData.cutoff + "\n";
s = "\n" + s;
@@ -332,7 +332,7 @@
Lst<Map<String, Object>> mos = (Lst<Map<String, Object>>)
(sg.params.moData
.get("mos"));
int nOrb = (mos == null ? 0 : mos.size());
- int thisMO = param;
+ int thisMO = index;
int currentMO = moNumber;
boolean isShowCurrent = (thisMO == Integer.MIN_VALUE);
if (thisMO == Integer.MAX_VALUE) {
@@ -371,7 +371,7 @@
true, 0, null, null));
return str.toString();
}
- return getPropI(propertyName);
+ return getPropI(propertyName, index);
}
@SuppressWarnings("unchecked")
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
