Revision: 21061
http://sourceforge.net/p/jmol/code/21061
Author: hansonr
Date: 2016-04-20 15:08:20 +0000 (Wed, 20 Apr 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.5.4_2016.04.20"
bug fix: CIF files with missing tags that Jmol needs fail to load at all.
(Not necessarily a bad thing, but it is not supposed to fail so
dramatically.)
Modified Paths:
--------------
trunk/Jmol/src/javajs/util/CifDataParser.java
trunk/Jmol/src/org/jmol/adapter/readers/cif/MMTFReader.java
trunk/Jmol/src/org/jmol/adapter/readers/cif/MessagePackReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/javajs/util/CifDataParser.java
===================================================================
--- trunk/Jmol/src/javajs/util/CifDataParser.java 2016-04-20 05:14:11 UTC
(rev 21060)
+++ trunk/Jmol/src/javajs/util/CifDataParser.java 2016-04-20 15:08:20 UTC
(rev 21061)
@@ -299,6 +299,8 @@
getTokenPeeked();
n++;
}
+ if (n == 0)
+ n = columnCount; // end-of-label-section skip
int m = 0;
while ((str = getNextDataToken()) != null) {
if (ret == null)
Modified: trunk/Jmol/src/org/jmol/adapter/readers/cif/MMTFReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/cif/MMTFReader.java 2016-04-20
05:14:11 UTC (rev 21060)
+++ trunk/Jmol/src/org/jmol/adapter/readers/cif/MMTFReader.java 2016-04-20
15:08:20 UTC (rev 21061)
@@ -468,7 +468,7 @@
*/
private void getStructure(byte[] a) {
BS[] bsStructures = new BS[] { new BS(), null, new BS(), new BS(), new
BS(), null, new BS() };
- //if (Logger.debugging)
+ if (Logger.debugging)
Logger.info(PT.toJSON("secStructList", a));
for (int i = 0; i < a.length; i++) {
int type = a[i];
Modified: trunk/Jmol/src/org/jmol/adapter/readers/cif/MessagePackReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/cif/MessagePackReader.java
2016-04-20 05:14:11 UTC (rev 21060)
+++ trunk/Jmol/src/org/jmol/adapter/readers/cif/MessagePackReader.java
2016-04-20 15:08:20 UTC (rev 21061)
@@ -3,8 +3,6 @@
import java.util.Hashtable;
import java.util.Map;
-import org.jmol.util.Logger;
-
import javajs.api.GenericBinaryDocument;
import javajs.util.BC;
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-04-20 05:14:11 UTC
(rev 21060)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-04-20 15:08:20 UTC
(rev 21061)
@@ -74,8 +74,13 @@
TODO: slightly stronger unitcell lines for near point?
-Jmol.___JmolVersion="14.5.4_2016.04.19"
+Jmol.___JmolVersion="14.5.4_2016.04.20"
+bug fix: CIF files with missing tags that Jmol needs fail to load at all.
+ (Not necessarily a bad thing, but it is not supposed to fail so
dramatically.)
+
+JmolVersion="14.5.4_2016.04.19"
+
FEATURE NOTE: DSSP calculation at http://www.cmbi.ru.nl/dssp.html as changed
from the original version, now emphasizing pi-helices (type
"helix-5")
insteda of alpha. The pi-helix set is determined first,
then alpha helices
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
