Revision: 20345
http://sourceforge.net/p/jmol/code/20345
Author: hansonr
Date: 2015-02-28 19:29:35 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.12_2015.02.28"
bug fix: reading PNGJ file saved after load with /dssr or /rna3d annotations
ignores annotations
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
2015-02-28 19:28:41 UTC (rev 20344)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
2015-02-28 19:29:35 UTC (rev 20345)
@@ -36,6 +36,7 @@
import org.jmol.script.SV;
import org.jmol.util.Logger;
import javajs.util.P3;
+import javajs.util.PT;
import javajs.util.Rdr;
import javajs.util.V3;
import org.jmol.viewer.Viewer;
@@ -199,7 +200,8 @@
if (htParams.containsKey("concatenate")) {
String s = "";
for (int i = 0; i < size; i++) {
- String f = vwr.getFileAsString3(names[i], false, null);
+ String name = names[i];
+ String f = vwr.getFileAsString3(name, false, null);
if (i > 0 && size <= 3 && f.startsWith("{")) {
// JSON domains and validations; could have both
// hack to determine type:
@@ -209,11 +211,13 @@
htParams.put(type, x);
continue;
}
- if (names[i].indexOf("/rna3dhub/") >= 0) {
+ if (name.indexOf("|") >= 0)
+ name = PT.rep(name, "_", "/");
+ if (name.indexOf("/rna3dhub/") >= 0) {
s += "\n_rna3d \n;" + f + "\n;\n";
continue;
}
- if (names[i].indexOf("/dssr/") >= 0) {
+ if (name.indexOf("/dssr/") >= 0) {
s += "\n_dssr \n;" + f + "\n;\n";
continue;
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28 19:28:41 UTC
(rev 20344)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28 19:29:35 UTC
(rev 20345)
@@ -16,6 +16,7 @@
Jmol.___JmolVersion="14.3.12_2015.02.28"
+bug fix: reading PNGJ file saved after load with /dssr or /rna3d annotations
ignores annotations
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
note: show image replaced by new command IMAGE
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
