Revision: 20707
http://sourceforge.net/p/jmol/code/20707
Author: hansonr
Date: 2015-08-19 03:06:58 +0000 (Wed, 19 Aug 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.08.18"
bug fix: PyMOL reader not reading "H69" as "helix"
(RGS-Ga_8pdb_structures_aligned_S90_20.5.15.pse)
bug fix: PyMOL labels offset in Y direction (down.pse) see
http://noys3.weizmann.ac.il/a2jb/browse
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
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
trunk/Jmol/src/org/jmol/modelset/Text.java
trunk/Jmol/src/org/jmol/util/Escape.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
2015-08-18 06:25:34 UTC (rev 20706)
+++ trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLReader.java
2015-08-19 03:06:58 UTC (rev 20707)
@@ -1061,7 +1061,7 @@
bsState.set(ac);
String label = stringAt(a, 9);
- String ssType = stringAt(a, 10);
+ String ssType = stringAt(a, 10).substring(0, 1);
if (seqNo >= MIN_RESNO
&& (!ssType.equals(" ") || name.equals("CA") || isNucleic)) {
BS bs = ssMapSeq.get(ssType);
Modified: trunk/Jmol/src/org/jmol/modelset/Text.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/Text.java 2015-08-18 06:25:34 UTC (rev
20706)
+++ trunk/Jmol/src/org/jmol/modelset/Text.java 2015-08-19 03:06:58 UTC (rev
20707)
@@ -263,7 +263,7 @@
//dy: added -lineHeight (for one line)
if (pymolOffset[0] == 1) {
// from PyMOL - back to original plan
- // dy += lineHeight;
+ dy -= descent;
}
// xAdj and yAdj are the adjustments for the box itself relative to
the text
Modified: trunk/Jmol/src/org/jmol/util/Escape.java
===================================================================
--- trunk/Jmol/src/org/jmol/util/Escape.java 2015-08-18 06:25:34 UTC (rev
20706)
+++ trunk/Jmol/src/org/jmol/util/Escape.java 2015-08-19 03:06:58 UTC (rev
20707)
@@ -118,6 +118,8 @@
return eP((T3) x);
if (x instanceof P4)
return eP4((P4) x);
+ if (AU.isAP(x))
+ return eAP((T3[]) x);
if (AU.isAS(x))
return eAS((String[]) x, true);
if (x instanceof M34)
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-18 06:25:34 UTC
(rev 20706)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-19 03:06:58 UTC
(rev 20707)
@@ -56,11 +56,17 @@
appear at a different location. An interesting challenge to figure out the
algorithm
that still places it in the "proper" place even when perspective is on.
(Daniele Tomerini)
+Jmol.___JmolVersion="14.3.16_2015.08.18"
-Jmol.___JmolVersion="14.3.16_2015.08.17"
+bug fix: PyMOL reader not reading "H69" as "helix"
(RGS-Ga_8pdb_structures_aligned_S90_20.5.15.pse)
+bug fix: PyMOL labels offset in Y direction (down.pse) see
http://noys3.weizmann.ac.il/a2jb/browse
+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
- bug fix: select %? not working
- bug fix: select ^? not working
+___JmolVersion="14.3.16_2015.08.17"
+
+bug fix: select %? not working
+bug fix: select ^? not working
___JmolVersion="14.3.16_2015.08.17"
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
