Revision: 20392
http://sourceforge.net/p/jmol/code/20392
Author: hansonr
Date: 2015-03-19 21:49:23 +0000 (Thu, 19 Mar 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.03.19"
bug fix: VASP chgcar surface reader fails to recognize 10-per-line file format
Modified Paths:
--------------
trunk/Jmol/src/javajs/util/PT.java
trunk/Jmol/src/org/jmol/jvxl/readers/PeriodicVolumeFileReader.java
trunk/Jmol/src/org/jmol/jvxl/readers/VaspChgcarReader.java
trunk/Jmol/src/org/jmol/jvxl/readers/VolumeFileReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/javajs/util/PT.java
===================================================================
--- trunk/Jmol/src/javajs/util/PT.java 2015-03-19 21:48:33 UTC (rev 20391)
+++ trunk/Jmol/src/javajs/util/PT.java 2015-03-19 21:49:23 UTC (rev 20392)
@@ -296,9 +296,7 @@
public static float parseFloatNext(String str, int[] next) {
int cch = (str == null ? -1 : str.length());
- if (next[0] < 0 || next[0] >= cch)
- return Float.NaN;
- return parseFloatChecked(str, cch, next, false);
+ return (next[0] < 0 || next[0] >= cch ? Float.NaN : parseFloatChecked(str,
cch, next, false));
}
public static float parseFloatStrict(String str) {
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/PeriodicVolumeFileReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/PeriodicVolumeFileReader.java
2015-03-19 21:48:33 UTC (rev 20391)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/PeriodicVolumeFileReader.java
2015-03-19 21:49:23 UTC (rev 20392)
@@ -73,7 +73,4 @@
protected abstract void getPeriodicVoxels() throws Exception;
- static {
- System.out.println(-5 % 10);
- }
}
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/VaspChgcarReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/VaspChgcarReader.java 2015-03-19
21:48:33 UTC (rev 20391)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/VaspChgcarReader.java 2015-03-19
21:49:23 UTC (rev 20392)
@@ -28,6 +28,7 @@
import org.jmol.util.Logger;
import org.jmol.util.SimpleUnitCell;
+import javajs.util.PT;
import javajs.util.SB;
class VaspChgcarReader extends PeriodicVolumeFileReader {
@@ -101,11 +102,11 @@
}
}
- private int pt;
+ private int pt, nPerLine;
@Override
protected float nextVoxel() throws Exception {
- if ((pt++)%5 == 0) {
+ if (pt++ % nPerLine == 0 && nData > 0) {
rd();
next[0] = 0;
}
@@ -119,6 +120,7 @@
int nj = voxelCounts[1] - 1;
int nk = voxelCounts[2] - 1;
boolean downSampling = (nSkipX > 0);
+ nPerLine = PT.countTokens(rd(), 0);
for (int i = 0; i < ni; i++) {
for (int j = 0; j < nj; j++) {
for (int k = 0; k < nk; k++) {
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/VolumeFileReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/VolumeFileReader.java 2015-03-19
21:48:33 UTC (rev 20391)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/VolumeFileReader.java 2015-03-19
21:49:23 UTC (rev 20392)
@@ -51,7 +51,7 @@
protected boolean canDownsample;
protected int[] downsampleRemainders;
private boolean preProcessPlanes;
- private int nData;
+ protected int nData;
private boolean readerClosed;
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-19 21:48:33 UTC
(rev 20391)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-19 21:49:23 UTC
(rev 20392)
@@ -14,8 +14,12 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.13_2015.03.16"
+Jmol.___JmolVersion="14.3.13_2015.03.19"
+bug fix: VASP chgcar surface reader fails to recognize 10-per-line file format
+
+JmolVersion="14.3.13_2015.03.16"
+
bug fix: label <color ...> xxxx </color> does not calculate stringwidth
properly; set labeloffset 0 incorrect
JmolVersion="14.3.13_2015.03.13"
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
