Revision: 20486
http://sourceforge.net/p/jmol/code/20486
Author: hansonr
Date: 2015-05-07 12:27:16 +0000 (Thu, 07 May 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.05.07"
bug fix: x = plane(@1 @2 @3) fails
bug fix: isolated bio groups such as AMP, which are not part of biopolymers,
can result in crashes
when colored or queried about their parameters (Hiroufmi Suzuki)
bug fix: new SQL ** feature needed a tweak
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/scriptext/MathExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
Modified: trunk/Jmol/src/org/jmol/scriptext/MathExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/MathExt.java 2015-05-07 11:53:05 UTC
(rev 20485)
+++ trunk/Jmol/src/org/jmol/scriptext/MathExt.java 2015-05-07 12:27:16 UTC
(rev 20486)
@@ -1816,8 +1816,6 @@
// plane(<point1>,<point2>,<point3>,<pointref>)
V3 vAB = new V3();
P3 ptref = (args.length == 4 ? mp.ptValue(args[3]) : null);
- if (ptref == null)
- return false;
float nd = Measure.getDirectedNormalThroughPoints(pt1, pt2, pt3,
ptref, norm, vAB);
return mp.addXPt4(P4.new4(norm.x, norm.y, norm.z, nd));
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 11:53:05 UTC
(rev 20485)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 12:27:16 UTC
(rev 20486)
@@ -14,15 +14,18 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-JmolVersion="14.3.13_2015.05.07"
+Jmol.___JmolVersion="14.3.13_2015.05.07"
+bug fix: x = plane(@1 @2 @3) fails
+
bug fix: isolated bio groups such as AMP, which are not part of biopolymers,
can result in crashes
when colored or queried about their parameters (Hiroufmi Suzuki)
+bug fix: new SQL ** feature needed a tweak
-Jmol.___JmolVersion="14.3.13_2015.05.06"
+JmolVersion="14.3.13_2015.05.06"
-new feature: "drilling" in associative arrays for sub arrays with a given
property (Rolf Huehne)
+new feature: SQL "drilling" in associative arrays for sub arrays with a given
property (Rolf Huehne)
-- uses "**" as the SELECT option, sort of the way ** sometimes means
"subdirectories of"
-- returns an associative array or "" if no match
-- example:
Modified: trunk/Jmol/src/org/jmol/viewer/PropertyManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2015-05-07 11:53:05 UTC
(rev 20485)
+++ trunk/Jmol/src/org/jmol/viewer/PropertyManager.java 2015-05-07 12:27:16 UTC
(rev 20486)
@@ -410,7 +410,6 @@
}
if (key.length() == 0)
return "";
- key = key.substring(1);
asMap = true;
} else if (!vwr.checkSelect((Map<String, SV>) property, (T[])
arg.value))
return "";
@@ -434,6 +433,8 @@
return extractProperty(property, args, ptr, v2, true);
}
if (key.contains(",")) {
+ if (asMap)
+ key = key.substring(1);
Map<String, Object> mapNew = new Hashtable<String, Object>();
String[] tokens = PT.split(key, ",");
for (int i = tokens.length; --i >= 0;)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
