From: <ha...@us...> - 2014-01-29 11:55:09
|
Revision: 19231 http://sourceforge.net/p/jmol/code/19231 Author: hansonr Date: 2014-01-29 11:55:02 +0000 (Wed, 29 Jan 2014) Log Message: ----------- ___JmolVersion="14.1.8_dev_2014.01.29" bug fix: show MENU write MENU load MENU all broken in 12.2 Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java trunk/Jmol/src/org/jmol/script/T.java trunk/Jmol/src/org/jmol/scriptext/ScriptExt.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2014-01-28 23:27:05 UTC (rev 19230) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2014-01-29 11:55:02 UTC (rev 19231) @@ -97,6 +97,8 @@ * rendering engine, the ModelSet and Shape classes, and the Adapter file * reader classes form the core of the Jmol molecular visualization framework. * + * An extension of this file is org.jmol.scriptext.ScriptExt . + * * The ScriptEvaluator has just a few entry points, which you will find * immediately following this comment. They include: * Modified: trunk/Jmol/src/org/jmol/script/T.java =================================================================== --- trunk/Jmol/src/org/jmol/script/T.java 2014-01-28 23:27:05 UTC (rev 19230) +++ trunk/Jmol/src/org/jmol/script/T.java 2014-01-29 11:55:02 UTC (rev 19231) @@ -1206,10 +1206,11 @@ public final static int mode = misc | 200; public final static int modify = misc | 201; public final static int modifyorcreate = misc | 202; - public final static int modelbased = misc | 204; - public final static int molecular = misc | 205; - public final static int monomer = misc | 206; - public final static int morph = misc | 207; + public final static int modelbased = misc | 203; + public final static int molecular = misc | 204; + public final static int monomer = misc | 205; + public final static int morph = misc | 206; + public final static int mouse = misc | 207; public final static int movie = misc | 208; public final static int mrc = misc | 209; public final static int msms = misc | 210; @@ -1924,6 +1925,7 @@ "monomer", T.t(monomer), "morph", T.t(morph), "movie", T.t(movie), + "mouse", T.t(mouse), "mul", T.t(mul), "mul3", T.t(mul3), "nci", T.t(nci), Modified: trunk/Jmol/src/org/jmol/scriptext/ScriptExt.java =================================================================== --- trunk/Jmol/src/org/jmol/scriptext/ScriptExt.java 2014-01-28 23:27:05 UTC (rev 19230) +++ trunk/Jmol/src/org/jmol/scriptext/ScriptExt.java 2014-01-29 11:55:02 UTC (rev 19231) @@ -5614,17 +5614,19 @@ case T.solvent: value = "?"; break; + case T.mouse: + String qualifiers = ((len = slen) == 2 ? null : parameterAsString(2)); + if (!chk) + msg = viewer.getBindingInfo(qualifiers); + break; + case T.menu: + if (!chk) + value = viewer.getMenu(""); + break; case T.identifier: if (str.equalsIgnoreCase("fileHeader")) { if (!chk) msg = viewer.getPDBHeader(); - } else if (str.equalsIgnoreCase("menu")) { - if (!chk) - value = viewer.getMenu(""); - } else if (str.equalsIgnoreCase("mouse")) { - String qualifiers = ((len = slen) == 2 ? null : parameterAsString(2)); - if (!chk) - msg = viewer.getBindingInfo(qualifiers); } break; } Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-01-28 23:27:05 UTC (rev 19230) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-01-29 11:55:02 UTC (rev 19231) @@ -13,8 +13,9 @@ # important for the JavaScript version of Jmol. -___JmolVersion="14.1.8_dev_2014.01.28" +___JmolVersion="14.1.8_dev_2014.01.29" +bug fix: show MENU write MENU load MENU all broken in 12.2 code: methods from jcampdxReader extracted to org.jmol.jsv.JDXMOLParser bug fix: {*}[n] should be empty if nAtoms <=n code: reader overhaul for setting atom coordinates in a consistent fashion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |