Revision: 20284
http://sourceforge.net/p/jmol/code/20284
Author: hansonr
Date: 2015-02-12 00:15:16 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.12_2015.02.11"
bug fix: 14.3.12_2015.02.09 breaks MODEL "someTitle" syntax
bug fix: MUTATE not properly saved in state
bug fix: "USER MOD" not accepted at beginning of PDB file (MolProbity breaking
PDB format here)
bug fix: 02.10 may break loading ligand files
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/modelset/ModelSet.java
trunk/Jmol/src/org/jmol/script/ScriptEval.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-02-11 22:03:44 UTC
(rev 20283)
+++ trunk/Jmol/src/org/jmol/modelset/ModelSet.java 2015-02-12 00:15:16 UTC
(rev 20284)
@@ -270,6 +270,15 @@
return modelSetTypeName;
}
+ /**
+ *
+ * @param modelNumber
+ * can be a PDB MODEL number or a simple index number, or a fffnnnnnn
+ * f.n number
+ * @param useModelNumber
+ * @param doSetTrajectory
+ * @return
+ */
public int getModelNumberIndex(int modelNumber, boolean useModelNumber,
boolean doSetTrajectory) {
if (useModelNumber) {
@@ -279,6 +288,8 @@
return i;
return -1;
}
+ if (modelNumber < 1000000)
+ return modelNumber;
//new decimal format: frame 1.2 1.3 1.4
for (int i = 0; i < mc; i++)
if (modelFileNumbers[i] == modelNumber) {
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-02-11 22:03:44 UTC
(rev 20283)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-02-12 00:15:16 UTC
(rev 20284)
@@ -5099,13 +5099,9 @@
if (theTok == T.decimal && haveFileSet && fFrame == (int) fFrame)
iFrame = (int) fFrame * 1000000;
if (iFrame == Integer.MAX_VALUE) {
- if (i == 1) {
- String id = theToken.value.toString();
- iFrame = (chk ? -2 : vwr.getModelIndexFromId(id));
- } else {
- iFrame = 0; // frame 0.0
- }
useModelNumber = false;
+ frameList[nFrames++] = (chk || i != 1 ? 0 :
vwr.getModelIndexFromId(theToken.value.toString()));
+ break;
}
if (iFrame == -1) {
checkLength(offset + 1);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-11 22:03:44 UTC
(rev 20283)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-12 00:15:16 UTC
(rev 20284)
@@ -17,6 +17,7 @@
Jmol.___JmolVersion="14.3.12_2015.02.11"
+bug fix: 14.3.12_2015.02.09 breaks MODEL "someTitle" syntax
bug fix: MUTATE not properly saved in state
bug fix: "USER MOD" not accepted at beginning of PDB file (MolProbity
breaking PDB format here)
bug fix: 02.10 may break loading ligand files
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
