Revision: 20795
http://sourceforge.net/p/jmol/code/20795
Author: hansonr
Date: 2015-09-23 17:51:08 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.09.23"
bug fix: within(0.0, {0 0 0}) fails when no atoms in model
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/modelset/ModelSet.java
trunk/Jmol/src/org/jmol/script/ScriptEval.java
trunk/Jmol/src/org/jmol/script/ScriptExpr.java
trunk/Jmol/src/org/jmol/viewer/GlobalSettings.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/modelset/ModelSet.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/ModelSet.java 2015-09-22 17:35:24 UTC
(rev 20794)
+++ trunk/Jmol/src/org/jmol/modelset/ModelSet.java 2015-09-23 17:51:08 UTC
(rev 20795)
@@ -2306,7 +2306,7 @@
AtomIndexIterator iter = getSelectedAtomIterator(null, false, false, false,
false);
for (int iModel = mc; --iModel >= 0;) {
- if (!bsCheck.get(iModel))
+ if (!bsCheck.get(iModel) || am[iModel].bsAtoms.isEmpty())
continue;
setIteratorForAtom(iter, -1, am[iModel].firstAtomIndex, -1, null);
iter.setCenter(coord, distance);
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-09-22 17:35:24 UTC
(rev 20794)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-09-23 17:51:08 UTC
(rev 20795)
@@ -3545,14 +3545,14 @@
// start of FOR (i in x) block or FOR (i from x)
forVar = getContextVariableAsVariable(key, isLocal);
if (forVar == null && !isLocal)
- forVar = vwr.g.getOrSetNewVariable(key, false);
- if (forVar == null) {
+ forVar = vwr.g.getAndSetNewVariable(key, false);
+ if (forVar == null || forVar.myName == null) {
if (key.startsWith("_"))
invArg();
if (isLocal)
contextVariables.put(key.toLowerCase(), forVar = SV.newI(0));
else
- forVar = vwr.g.getOrSetNewVariable(key, true);
+ forVar = vwr.g.getAndSetNewVariable(key, true);
}
if (inTok == T.integer) {
// for (i from [0 31])
Modified: trunk/Jmol/src/org/jmol/script/ScriptExpr.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptExpr.java 2015-09-22 17:35:24 UTC
(rev 20794)
+++ trunk/Jmol/src/org/jmol/script/ScriptExpr.java 2015-09-23 17:51:08 UTC
(rev 20795)
@@ -604,7 +604,7 @@
rpn.addOp(T.tokenRightParen);
}
} else {
- var = vwr.g.getOrSetNewVariable(name, false);
+ var = vwr.g.getAndSetNewVariable(name, false);
switch (var.tok) {
case T.integer:
case T.decimal:
@@ -2215,7 +2215,7 @@
if (needVariable && key != null) {
if (key.startsWith("_")
- || (t = vwr.g.getOrSetNewVariable(key, true)) == null)
+ || (t = vwr.g.getAndSetNewVariable(key, true)) == null)
errorStr(ERROR_invalidArgument, key);
}
if (t != null)
Modified: trunk/Jmol/src/org/jmol/viewer/GlobalSettings.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/GlobalSettings.java 2015-09-22 17:35:24 UTC
(rev 20794)
+++ trunk/Jmol/src/org/jmol/viewer/GlobalSettings.java 2015-09-23 17:51:08 UTC
(rev 20795)
@@ -810,7 +810,7 @@
* @return a new variable if possible, but null if "_xxx"
*
*/
- public SV getOrSetNewVariable(String name, boolean doSet) {
+ public SV getAndSetNewVariable(String name, boolean doSet) {
if (name == null || name.length() == 0)
name = "x";
Object v = getParam(name, true);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-22 17:35:24 UTC
(rev 20794)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-23 17:51:08 UTC
(rev 20795)
@@ -59,11 +59,14 @@
TODO: image (not found) stops JSmol
-TODO: @{...}
-TODO: check @{getproperty)
+TODO: consider if models with no atoms will cause issues in relation to
model.firstAtomIndex
-Jmol.___JmolVersion="14.3.16_2015.09.22"
+Jmol.___JmolVersion="14.3.16_2015.09.23"
+bug fix: within(0.0, {0 0 0}) fails when no atoms in model
+
+JmolVersion="14.3.16_2015.09.22"
+
bug fix: for(var x in ...) does not respect "var"
bug fix: x.format("JSON") fails for recursive x
@@ -471,7 +474,7 @@
bug fix: MOVE command with 0 time does not work
-___JmolVersion="14.3.16_2015.08.31"
+JmolVersion="14.3.16_2015.08.31"
bug fix: plot property with nothing more throws Exception
bug fix: Gaussian Dialog does not add final line ending when saving
@@ -762,13 +765,13 @@
bug fix: PyMOL session with isosurface cannot be read from state
known bug: RGS-Ga_8pdb_structures_aligned_S90_20.5.15.pse has two frames;
showing frame 2 with no displayed atoms
-___JmolVersion="14.3.16_2015.08.17"
+JmolVersion="14.3.16_2015.08.17"
bug fix: select %? not working
bug fix: select ^? not working
-___JmolVersion="14.3.16_2015.08.17"
+JmolVersion="14.3.16_2015.08.17"
released
bug fix: PDB reader cuts off long titles.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
