From: <ha...@us...> - 2008-03-11 16:32:34
|
Revision: 9086 http://jmol.svn.sourceforge.net/jmol/?rev=9086&view=rev Author: hansonr Date: 2008-03-11 09:32:29 -0700 (Tue, 11 Mar 2008) Log Message: ----------- version=11.5.15_dev # bug fix: CAChe CSF reader not reading partial charges Modified Paths: -------------- trunk/Jmol/src/org/jmol/adapter/readers/more/CsfReader.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/adapter/readers/more/CsfReader.java =================================================================== --- trunk/Jmol/src/org/jmol/adapter/readers/more/CsfReader.java 2008-03-11 15:36:27 UTC (rev 9085) +++ trunk/Jmol/src/org/jmol/adapter/readers/more/CsfReader.java 2008-03-11 16:32:29 UTC (rev 9086) @@ -108,7 +108,6 @@ private Hashtable propertyItemCounts = new Hashtable(); int[] fieldTypes = new int[100]; // should be enough - int nFields = 0; int getPropertyCount(String what) { Integer count = (Integer)(propertyItemCounts.get(what)); @@ -117,7 +116,8 @@ private int parseLineParameters(String[] fields, byte[] fieldMap) throws Exception { - + for (int i = 0; i < fieldCount; i++) + fieldTypes[i] = 0; fieldCount = -1; if (line == null || line.startsWith("property_flags:")) readLine(); @@ -136,18 +136,15 @@ readLine(); } // ID line: - for (int i = 0; i < nFields; i++) - fieldTypes[i] = 0; for (int ipt = 0, fpt = 0; ipt < tokens.length; ipt++ ) { String field = tokens[ipt]; for (int i = fields.length; --i >= 0; ) if (field.equals(fields[i])) { fieldTypes[fpt] = fieldMap[i]; - fieldCount = ipt + 1; + fieldCount = fpt + 1; break; } fpt += getPropertyCount(field); - nFields = fpt; } return fieldCount; } Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-03-11 15:36:27 UTC (rev 9085) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-03-11 16:32:29 UTC (rev 9086) @@ -1,5 +1,6 @@ version=11.5.15_dev +# bug fix: CAChe CSF reader not reading partial charges # bug fix: WebExport with http:// files fails to save file # bug fix: WebExport with local . directory fails to save JmolApplet.jar and Jmol.js # code: refactoring of jmol.app.webexport: adding html subdirectory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |