Revision: 20287
http://sourceforge.net/p/jmol/code/20287
Author: hansonr
Date: 2015-02-12 12:46:39 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/readers/pdb/PdbReader.java
trunk/Jmol/src/org/jmol/adapter/readers/xtal/JanaReader.java
Modified: trunk/Jmol/src/org/jmol/adapter/readers/pdb/PdbReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/pdb/PdbReader.java 2015-02-12
00:38:19 UTC (rev 20286)
+++ trunk/Jmol/src/org/jmol/adapter/readers/pdb/PdbReader.java 2015-02-12
12:46:39 UTC (rev 20287)
@@ -525,9 +525,10 @@
}
private void title() {
- if (lineLength < 10)
- return;
- appendLoadNote(line.substring(10).trim());
+ if (lineLength > 72)
+ line = line.substring(0, 72);
+ if (lineLength >= 10)
+ appendLoadNote(line.substring(10).trim());
}
private void compnd(boolean isSource) {
@@ -863,7 +864,7 @@
atom.atomName = name;
if (altID != ' ')
atom.altLoc = altID;
- atom.group3 = group3;
+ atom.group3 = (group3 == null ? "UNK" : group3);
atom.chainID = chainID;
if (biomtChainAtomCounts != null)
biomtChainAtomCounts[chainID % 256]++;
Modified: trunk/Jmol/src/org/jmol/adapter/readers/xtal/JanaReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/xtal/JanaReader.java
2015-02-12 00:38:19 UTC (rev 20286)
+++ trunk/Jmol/src/org/jmol/adapter/readers/xtal/JanaReader.java
2015-02-12 12:46:39 UTC (rev 20287)
@@ -335,8 +335,6 @@
return;
m40File = m40File.substring(0, ipt + 2) + "40";
String id = m40File.substring(0, ipt);
- ipt = id.lastIndexOf("/");
- id = id.substring(ipt + 1);
reader.close();
reader = Rdr.getBR((String) vwr.getLigandModel(id, m40File, "_file",
"----"));
if (out != null)
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
