Revision: 20876
http://sourceforge.net/p/jmol/code/20876
Author: hansonr
Date: 2015-12-01 05:38:40 +0000 (Tue, 01 Dec 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.11.30"
bug fix: getProperty("JSON", "variableInfo", "x") will fail if x is an array
-- was problem with JSV_predict2 failing to properly map atoms between Jmol
and JSME
bug fix: {atomset}.sxyz gives incorrect screen coordinate when antialiased
bug fix: point(pt, true|false) also modifies pt itself
bug fix: point({atomset}, true) gives incorrect screen coordinate when
antialiased.
bug fix: point({atomset}, false) gives incorrect Cartesian coordinate when
antialiased.
bug fix: popup menu item "Surfaces...Off" resets atom selection
bug fix: files with names containing "[]" cannot be loaded.
bug fix: print {cell=555}.find("cellFormula") can fail because of 2% slop
involved in defining cell=555
bug fix: {atomset}.split() [split atomset by model] returns array of strings,
not array of atoms
bug fix: getproperty SHAPEINFO fails if CGO is present
bug fix: CGO from state deletes DRAW objects
bug fix: CGO not properly isolated to current model; "fixed" not implemented
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/scriptext/MathExt.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v14_4/Jmol/src/org/jmol/viewer/PropertyManager.java
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/MathExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/MathExt.java 2015-12-01
05:14:58 UTC (rev 20875)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/MathExt.java 2015-12-01
05:38:40 UTC (rev 20876)
@@ -1509,7 +1509,7 @@
Object property = vwr.getProperty(null, propertyName, propertyValue);
if (pt < args.length)
property = vwr.extractProperty(property, args, pt);
- return mp.addXObj(isJSON ? "{" + PT.toJSON("value", property) + "}" : SV
+ return mp.addXObj(isJSON ? SV.safeJSON("value", property) : SV
.isVariableType(property) ? property : Escape.toReadable(propertyName,
property));
}
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-01
05:14:58 UTC (rev 20875)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-01
05:38:40 UTC (rev 20876)
@@ -8,7 +8,7 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.5.0_2015.11.30"
+Jmol.___JmolVersion="14.4.0_2015.11.30"
bug fix: getProperty("JSON", "variableInfo", "x") will fail if x is an array
-- was problem with JSV_predict2 failing to properly map atoms between Jmol
and JSME
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/PropertyManager.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/PropertyManager.java
2015-12-01 05:14:58 UTC (rev 20875)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/PropertyManager.java
2015-12-01 05:38:40 UTC (rev 20876)
@@ -254,8 +254,8 @@
return (info == null ? "" : info.toString());
if (requestedReadable)
return Escape.toReadable(infoType, info);
- else if (returnType.equalsIgnoreCase("JSON"))
- return "{" + PT.toJSON(infoType, info) + "}";
+ if (returnType.equalsIgnoreCase("JSON"))
+ return SV.safeJSON(infoType, info);
return info;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
