Revision: 20343
http://sourceforge.net/p/jmol/code/20343
Author: hansonr
Date: 2015-02-28 17:53:53 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.12_2015.02.28"
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java
===================================================================
--- trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java 2015-02-28 17:53:25 UTC
(rev 20342)
+++ trunk/Jmol/src/org/jmol/smiles/SmilesMatcher.java 2015-02-28 17:53:53 UTC
(rev 20343)
@@ -370,6 +370,8 @@
try {
SmilesSearch search = SmilesParser.getMolecule(pattern, isSmarts);
search.jmolAtoms = atoms;
+ if (atoms instanceof BNode[])
+ search.bioAtoms = (BNode[]) atoms;
search.jmolAtomCount = Math.abs(ac);
if (ac < 0)
search.isSmilesFind = true;
@@ -393,6 +395,7 @@
return vl.toArray(AU.newInt2(vl.size()));
}
} catch (Exception e) {
+ e.printStackTrace();
if (InvalidSmilesException.getLastError() == null)
InvalidSmilesException.clear();
throw new InvalidSmilesException(InvalidSmilesException.getLastError());
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28 17:53:25 UTC
(rev 20342)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28 17:53:53 UTC
(rev 20343)
@@ -16,6 +16,8 @@
Jmol.___JmolVersion="14.3.12_2015.02.28"
+bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
+
note: show image replaced by new command IMAGE
new feature: image 300 400 # adjustable size
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
