Revision: 18496
http://sourceforge.net/p/jmol/code/18496
Author: hansonr
Date: 2013-07-27 21:43:40 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
___JmolVersion="13.3.3_dev_2013.07.27"
code: reconfigured JSmol build no longer needs jsmol/make directory.
bug fix: Gaussian cube format changed and not recognized (extra "1" in third
line).
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/smarter/Resolver.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/adapter/smarter/Resolver.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/Resolver.java 2013-07-27
19:04:22 UTC (rev 18495)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/Resolver.java 2013-07-27
21:43:40 UTC (rev 18496)
@@ -547,19 +547,17 @@
private static boolean checkCube(String[] lines) {
try {
- StringTokenizer tokens2 = new StringTokenizer(lines[2]);
- if (tokens2.countTokens() != 4)
- return false;
- Integer.parseInt(tokens2.nextToken());
- for (int i = 3; --i >= 0; )
- Parser.fVal(tokens2.nextToken());
- StringTokenizer tokens3 = new StringTokenizer(lines[3]);
- if (tokens3.countTokens() != 4)
- return false;
- Integer.parseInt(tokens3.nextToken());
- for (int i = 3; --i >= 0; )
- if (Parser.fVal(tokens3.nextToken()) < 0)
+ for (int j = 2; j <= 5; j++) {
+ StringTokenizer tokens2 = new StringTokenizer(lines[j]);
+ int n = tokens2.countTokens();
+ if (!(n == 4 || j == 2 && n == 5))
return false;
+ Integer.parseInt(tokens2.nextToken());
+ for (int i = 3; --i >= 0;)
+ Parser.fVal(tokens2.nextToken());
+ if (n == 5)
+ Integer.parseInt(tokens2.nextToken());
+ }
return true;
} catch (NumberFormatException nfe) {
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-07-27 19:04:22 UTC
(rev 18495)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-07-27 21:43:40 UTC
(rev 18496)
@@ -11,8 +11,11 @@
# The quotes above look odd for a parameter file, but they are
# important for the JavaScript version of Jmol.
-___JmolVersion="13.3.3_dev_2013.07.26"
+___JmolVersion="13.3.3_dev_2013.07.27"
+code: reconfigured JSmol build no longer needs jsmol/make directory.
+
+bug fix: Gaussian cube format changed and not recognized (extra "1" in third
line).
bug fix: PDB header don't do trim();
bug fix: isosuface ID @x ... becomes isosurface ID "@x"
bug fix: color chain broken
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
