From: <ha...@us...> - 2009-06-10 14:53:08
|
Revision: 10995 http://jmol.svn.sourceforge.net/jmol/?rev=10995&view=rev Author: hansonr Date: 2009-06-10 13:42:03 +0000 (Wed, 10 Jun 2009) Log Message: ----------- one more fix for 11.7.41 Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2009-06-10 13:17:52 UTC (rev 10994) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2009-06-10 13:42:03 UTC (rev 10995) @@ -3914,11 +3914,18 @@ if (!isSyntaxCheck) { data = getBitsetProperty(null, getToken(index++).tok | Token.minmaxmask, null, null, null, null, false, Integer.MAX_VALUE); - if (!(data instanceof float[])) - error(ERROR_invalidArgument); } } } + if (data != null && !(data instanceof float[])) { + if (data instanceof String[]) { + float[] fdata = new float[((String[])data).length]; + Parser.parseFloatArray((String[])data, null, fdata); + data = fdata; + } else { + error(ERROR_invalidArgument); + } + } } else if (pid == JmolConstants.PALETTE_VARIABLE) { index++; name = parameterAsString(index++); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |