Revision: 20595
http://sourceforge.net/p/jmol/code/20595
Author: hansonr
Date: 2015-06-19 15:45:34 +0000 (Fri, 19 Jun 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.15_2015.06.19b"
bug fix: AFLOW binary file reader can fail with certain VASP formats containing
both in-line atom labels and atom elements prior to #elements line.
(AlPd#5, for example)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
2015-06-19 15:27:58 UTC (rev 20594)
+++ trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
2015-06-19 15:45:34 UTC (rev 20595)
@@ -94,7 +94,10 @@
elementLabel = PT.getTokens(discardLinesUntilNonBlank());
String[] elementCounts;
if (PT.parseInt(elementLabel[0]) == Integer.MIN_VALUE) {
+ atomsLabeledInline = false;
elementCounts = PT.getTokens(rdline());
+ while (line != null && (elementCounts.length == 0 ||
parseIntStr(elementCounts[0]) == Integer.MIN_VALUE))
+ elementCounts = PT.getTokens(rdline());
// 6 24 18 6 6 24
} else {
elementCounts = elementLabel;
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-19 15:27:58 UTC
(rev 20594)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-19 15:45:34 UTC
(rev 20595)
@@ -14,8 +14,14 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.15_2015.06.19"
+Jmol.___JmolVersion="14.3.15_2015.06.19b"
+
+bug fix: AFLOW binary file reader can fail with certain VASP formats
containing
+ both in-line atom labels and atom elements prior to #elements line.
(AlPd#5, for example)
+
+JmolVersion="14.3.15_2015.06.19"
+
new feature: pt.distance(plane,ptRef)
-- returns a negative distance if pt and ptRef are on different sides of the
plane
-- useful for constructing 3D convex hulls and polyhedra, where all points
@@ -45,6 +51,7 @@
bug fix: wireframe ONLY (RESTRICT) executes polyhedral DELETE instead of OFF
bug fix: Polygons not indicating visibility when they are the only thing
visible.
+bug fix: x[++y] did not increment y. x[y++] and other contexts were fine
JmolVersion="14.3.15_2015.06.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
