Revision: 20842
http://sourceforge.net/p/jmol/code/20842
Author: hansonr
Date: 2015-10-21 05:50:24 +0000 (Wed, 21 Oct 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.5.0_2015.10.21"
bug fix: write c:/temp..... AS PNGJ does not work without quotes that way; it
should
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/render/MeshRenderer.java
trunk/Jmol/src/org/jmol/rendersurface/IsosurfaceRenderer.java
trunk/Jmol/src/org/jmol/script/ScriptCompiler.java
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/render/MeshRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/MeshRenderer.java 2015-10-20 23:16:29 UTC
(rev 20841)
+++ trunk/Jmol/src/org/jmol/render/MeshRenderer.java 2015-10-21 05:50:24 UTC
(rev 20842)
@@ -429,7 +429,7 @@
// simple quad -- DRAW only (isPrecision)
int iD = polygon[3];
short nD = normixes[iD];
- if (frontOnly && (check != 7 || transformedVectors[nD].z < 0))
+ if (frontOnly && (check != 7 || !isVisibleNormix(nD)))
continue;
if (fill) {
if (generateSet) {
@@ -458,8 +458,8 @@
exportSurface(colix);
}
- private boolean isVisibleNormix(short normix) {
- return (normix < 0 || transformedVectors[normix].z > 0);
+ protected boolean isVisibleNormix(short normix) {
+ return (normix < 0 || transformedVectors[normix].z >= 0);
}
private void drawTriangleBits(P3 screenA, short colixA, P3 screenB, short
colixB,
Modified: trunk/Jmol/src/org/jmol/rendersurface/IsosurfaceRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/rendersurface/IsosurfaceRenderer.java
2015-10-20 23:16:29 UTC (rev 20841)
+++ trunk/Jmol/src/org/jmol/rendersurface/IsosurfaceRenderer.java
2015-10-21 05:50:24 UTC (rev 20842)
@@ -306,7 +306,7 @@
for (int i = (!imesh.hasGridPoints || imesh.firstRealVertex < 0 ? 0
: imesh.firstRealVertex); i < vertexCount; i += incr) {
if (vertexValues != null && Float.isNaN(vertexValues[i]) || frontOnly
- && transformedVectors[normixes[i]].z < 0 || imesh.jvxlData.thisSet
>= 0
+ && !isVisibleNormix(normixes[i]) || imesh.jvxlData.thisSet >= 0
&& mesh.vertexSets[i] != imesh.jvxlData.thisSet ||
!mesh.isColorSolid
&& mesh.vcs != null && !setColix(mesh.vcs[i])
|| haveBsDisplay && !mesh.bsDisplay.get(i)
Modified: trunk/Jmol/src/org/jmol/script/ScriptCompiler.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-10-20 23:16:29 UTC
(rev 20841)
+++ trunk/Jmol/src/org/jmol/script/ScriptCompiler.java 2015-10-21 05:50:24 UTC
(rev 20842)
@@ -1258,14 +1258,15 @@
return OK;
}
if (lookingAtImpliedString(true, true, true)) {
- int pt = cchToken;
String str = script.substring(ichToken, ichToken + cchToken);
+ int pt = str.indexOf(" as ");
+ if (pt > 0)
+ str = str.substring(0, cchToken = pt);
if (str.indexOf(" ") < 0 && str.indexOf(".") >= 0) {
addTokenToPrefix(T.o(T.string, str));
iHaveQuotedString = true;
return CONTINUE;
}
- cchToken = pt;
}
}
break;
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-20 23:16:29 UTC
(rev 20841)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-21 05:50:24 UTC
(rev 20842)
@@ -3698,11 +3698,12 @@
fileName = SV.sValue(tokenAt(pt, args));
if (fileName.equalsIgnoreCase("clipboard") ||
!vwr.haveAccess(ACCESS.ALL))
fileName = null;
- else if (isCommand && argCount != slen && tokAt(pt + 1) == T.per
- && pt + 3 == argCount) {
- pt += 2;
- fileName += "." + SV.sValue(tokenAt(pt, args));
- }
+// else if (isCommand && argCount != slen
+// && (tokAt(pt + 1) == T.per || tokAt(pt + 1) == T.colon)) {
+// fileName = "";
+// while (pt < argCount)
+// fileName += SV.sValue(tokenAt(pt++, args));
+// }
break;
default:
invArg();
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-20 23:16:29 UTC
(rev 20841)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-21 05:50:24 UTC
(rev 20842)
@@ -64,8 +64,12 @@
TODO: working on ID for polyhedra without atom refs
-Jmol.___JmolVersion="14.5.0_2015.10.20"
+Jmol.___JmolVersion="14.5.0_2015.10.21"
+bug fix: write c:/temp..... AS PNGJ does not work without quotes that way;
it should
+
+JmolVersion="14.5.0_2015.10.20"
+
new feature: polyhedra with arbitrary center and vertices, without atom center
-- for example:
polyhedra ID "myid" {0 0 0} TO [{1 0 0}, {0 1 0}, {0 0 1}, {-1 -1 -1}]
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
