Revision: 18352
http://sourceforge.net/p/jmol/code/18352
Author: hansonr
Date: 2013-06-19 16:01:34 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-19 12:49:01 UTC
(rev 18351)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-19 16:01:34 UTC
(rev 18352)
@@ -11,11 +11,13 @@
___JmolVersion="13.1.17_dev_2013.06.19"
-TODO: Problems with getproperty(bondInfo) in JavaSCript
-TODO: JSmol script/scriptWait nuance with moveto.
TODO: PyMOL uniqueAtomSettings for transparency
-- will require by-vertex translucent option
+bug fix: applet getpropertyAsArray("bondInfo") fails
+bug fix: JSmol script/scriptWait nuance with moveto.
+ -- when using scriptWait with HTML5, there can be no threading
+
new feature: CIF reader upgrade to allow multicharacter chain specs.
-- See 1bgl_1bgm.cif
-- automatically switches to chainCaseSensitive if multi-character
Modified: trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2013-06-19 12:49:01 UTC
(rev 18351)
+++ trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2013-06-19 16:01:34 UTC
(rev 18352)
@@ -1220,6 +1220,9 @@
int bondCount = ms.bondCount;
Bond[] bonds = ms.bonds;
BS bs1;
+ if (bsOrArray instanceof String) {
+ bsOrArray = viewer.getAtomBitSet(bsOrArray);
+ }
if (bsOrArray instanceof BS[]) {
bs1 = ((BS[]) bsOrArray)[0];
BS bs2 = ((BS[]) bsOrArray)[1];
@@ -1234,7 +1237,7 @@
for (int i = bs1.nextSetBit(0); i >= 0 && i < bondCount; i = bs1
.nextSetBit(i + 1))
v.addLast(getBondInfo(i));
- } else {
+ } else if (bsOrArray instanceof BS){
bs1 = (BS) bsOrArray;
int thisAtom = (bs1.cardinality() == 1 ? bs1.nextSetBit(0) : -1);
for (int i = 0; i < bondCount; i++) {
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-06-19 12:49:01 UTC (rev
18351)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-06-19 16:01:34 UTC (rev
18352)
@@ -4446,6 +4446,7 @@
* return null;
* }
*/
+ {}
if (getScriptManager() == null)
return null;
return scriptManager.evalStringWaitStatusQueued(returnType, strScript,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
