Revision: 20900
http://sourceforge.net/p/jmol/code/20900
Author: hansonr
Date: 2015-12-23 04:17:37 +0000 (Wed, 23 Dec 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.1_2015.12.22"
bug fix: PyMOL 1.8 PSE files cannot be read
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
Modified:
branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
2015-12-22 18:37:19 UTC (rev 20899)
+++ branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
2015-12-23 04:17:37 UTC (rev 20900)
@@ -1081,8 +1081,9 @@
atom.radius = 1;
atom.partialCharge = floatAt(a, 17);
int formalCharge = intAt(a, 18);
-
+
BS bsReps = getBsReps(listAt(a, 20));
+ int intReps = (bsReps == null ? intAt(a, 20) : 0); // Pymol 1.8
int atomColor = intAt(a, 21);
int serNo = intAt(a, 22);
int cartoonType = intAt(a, 23);
@@ -1116,7 +1117,7 @@
if (isNucleic)
pymolScene.bsNucleic.set(ac);
for (int i = 0; i < PyMOL.REP_MAX; i++)
- if (bsReps.get(i))
+ if (bsReps == null ? ((intReps & (1<<i)) != 0) : bsReps.get(i))
reps[i].set(ac);
if (atom.elementSymbol.equals("H"))
pymolScene.bsHydrogen.set(ac);
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-22
18:37:19 UTC (rev 20899)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-23
04:17:37 UTC (rev 20900)
@@ -7,8 +7,12 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.1_2015.12.21"
+Jmol.___JmolVersion="14.4.1_2015.12.22"
+bug fix: PyMOL 1.8 PSE files cannot be read
+
+JmolVersion="14.4.1_2015.12.21"
+
bug fix: color [0xffffff] should not be case-sensitive -- [0Xffffff] should be
OK
bug fix: set spin fps ... fails
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
