From: <ha...@us...> - 2010-09-19 19:30:18
|
Revision: 14340 http://jmol.svn.sourceforge.net/jmol/?rev=14340&view=rev Author: hansonr Date: 2010-09-19 19:30:08 +0000 (Sun, 19 Sep 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/popup/MainPopupResourceBundle.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/popup/MainPopupResourceBundle.java =================================================================== --- trunk/Jmol/src/org/jmol/popup/MainPopupResourceBundle.java 2010-09-19 13:31:06 UTC (rev 14339) +++ trunk/Jmol/src/org/jmol/popup/MainPopupResourceBundle.java 2010-09-19 19:30:08 UTC (rev 14340) @@ -496,7 +496,7 @@ { "surfSolventAccessible14", "isosurface delete resolution 0 sasurface 1.4 translucent" }, { "CHARGEsurfMEP", - "isosurface delete resolution 0 molecular map MEP translucent" }, + "isosurface delete resolution 0 molecular color range all map MEP translucent" }, { "surfOpaque", "mo opaque;isosurface opaque" }, { "surfTranslucent", "mo translucent;isosurface translucent" }, { "surfOff", "mo delete;isosurface delete;select *;dots off" }, Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-09-19 13:31:06 UTC (rev 14339) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-09-19 19:30:08 UTC (rev 14340) @@ -234,6 +234,7 @@ #version=12.1.3 +# bug fix: unescaped spaces in load "$ethyl ether" cause fault at NIH. # bug fix: set picking invertStereo not working for non-ring stereocenters # new feature: load "myfile.xxx" {1 1 1} unitcell [ax ay az bx by bz cx cy cz] # new feature: x = compare({atomset1}, {atomset2}, "ISOMER") Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-09-19 13:31:06 UTC (rev 14339) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-09-19 19:30:08 UTC (rev 14340) @@ -100,6 +100,7 @@ import javax.vecmath.AxisAngle4f; import java.net.URL; +import java.net.URLEncoder; //import java.net.URLEncoder; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -112,6 +113,7 @@ import java.io.Reader; import java.io.StringReader; //import java.io.UnsupportedEncodingException; +import java.io.UnsupportedEncodingException; /* * @@ -4406,16 +4408,7 @@ s = s.substring(0, s.indexOf("%FILE") + 5); return TextFormat.formatString(s, "FILE", f); case '$': - - // try { - // f = URLEncoder.encode(f, "US-ASCII"); - // f = TextFormat.simpleReplace(f, "%2F", "/"); - // } catch (UnsupportedEncodingException e) { - // required only for - // http://cheminfov.informatics.indiana.edu/rest/thread/d3.py/SMILES/%FILE - // - // } - + f = TextFormat.simpleReplace(f, " ", "%20"); return (withPrefix ? "MOL::" : "") + TextFormat.formatString(global.smilesUrlFormat, "FILE", f); case '_': // isosurface "=...", but we code that type as '-' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |