From: <ha...@us...> - 2008-06-09 22:59:24
|
Revision: 9473 http://jmol.svn.sourceforge.net/jmol/?rev=9473&view=rev Author: hansonr Date: 2008-06-09 15:59:22 -0700 (Mon, 09 Jun 2008) Log Message: ----------- version=11.5.40_dev # bug fix: missing echocallback, scriptcallback, measurecallback "set"able variables Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/StateManager.java trunk/Jmol/src/org/jmol/viewer/Token.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-06-08 09:31:25 UTC (rev 9472) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2008-06-09 22:59:22 UTC (rev 9473) @@ -8236,7 +8236,7 @@ private void setPicking() throws ScriptException { if (statementLength == 2) { - setStringProperty("picking", "ident"); + setStringProperty("picking", "identify"); return; } if (statementLength > 4 || tokAt(2) == Token.string) { Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-06-08 09:31:25 UTC (rev 9472) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2008-06-09 22:59:22 UTC (rev 9473) @@ -3,6 +3,8 @@ version=11.5.40_dev +# bug fix: missing echocallback, scriptcallback, measurecallback "set"able variables +# bug fix: "set picking identify" should be equivalent to "set picking ident" # bug fix: popup menu had stereo reversed # new feature: signed applet shows frank "Jmol-S" which is NOT removable. Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2008-06-08 09:31:25 UTC (rev 9472) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2008-06-09 22:59:22 UTC (rev 9473) @@ -742,9 +742,11 @@ + ";picking;pickingstyle;propertycolorschemeoverload;radius;rgbblue;rgbgreen;rgbred" + ";scaleangstromsperinch;selectionhalos;showscript;showselections;solvent;strandcount" + ";spinx;spiny;spinz;spinfps" - + ";animframecallback;loadstructcallback;messagecallback;minimizationcallback;hovercallback" - + ";resizecallback;pickcallback;synccallback" + ";undo;"; + + ";animframecallback;echocallback;evalcallback;loadstructcallback" + + ";measurecallback;messagecallback;minimizationcallback;hovercallback" + + ";resizecallback;pickcallback;scriptcallback;synccallback;undo;"; + boolean isJmolVariable(String key) { return key.charAt(0) == '_' || htParameterValues.containsKey(key = key.toLowerCase()) Modified: trunk/Jmol/src/org/jmol/viewer/Token.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Token.java 2008-06-08 09:31:25 UTC (rev 9472) +++ trunk/Jmol/src/org/jmol/viewer/Token.java 2008-06-09 22:59:22 UTC (rev 9473) @@ -1263,7 +1263,8 @@ "hidden", new Token(hidden), "hydrogen", new Token(hydrogen), "hydrogens", null, - "ident", new Token(ident), + "identify", new Token(ident), + "ident", null, "info", new Token(info), "insertion", new Token(insertion), "insertions", null, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |