Revision: 20344
http://sourceforge.net/p/jmol/code/20344
Author: hansonr
Date: 2015-02-28 19:28:41 +0000 (Sat, 28 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.12_2015.02.28"
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
bug fix: reading PNGJ file saved after load with /dssr or /rna3d annotations
ignores annotations
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified:
branches/v14_2/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
2015-02-28 17:53:53 UTC (rev 20343)
+++ branches/v14_2/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
2015-02-28 19:28:41 UTC (rev 20344)
@@ -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: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28
17:53:53 UTC (rev 20343)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-28
19:28:41 UTC (rev 20344)
@@ -8,7 +8,8 @@
Jmol.___JmolVersion="14.2.12_2015.02.28"
bug fix: {*}.find("~d~G:C") broken (find with bioSMARTS)
-
+bug fix: reading PNGJ file saved after load with /dssr or /rna3d annotations
ignores annotations
+
JmolVersion="14.2.12_2015.02.26"
bug fix: imageFontScaling integer instead of float; does not scale
appropriately on resize
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
