Revision: 20829
http://sourceforge.net/p/jmol/code/20829
Author: hansonr
Date: 2015-10-15 00:01:37 +0000 (Thu, 15 Oct 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.10.14"
bug fix: SHOW PROPERTY IDENTIFY crashes Jmol.
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-13
19:32:29 UTC (rev 20828)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-15
00:01:37 UTC (rev 20829)
@@ -5067,10 +5067,13 @@
float min, float max)
throws ScriptException {
- float[] data = (float[]) (property == null ?
+ Object odata = (property == null ?
e.getBitsetProperty(bs, tok, null, null, null, null,
false, Integer.MAX_VALUE, false)
: vwr.getDataObj(property, bs, JmolDataManager.DATA_TYPE_AF));
+ if (odata == null || !AU.isAF(odata))
+ return new float[bs.cardinality()];
+ float[] data = (float[]) odata;
if (!Float.isNaN(min))
for (int i = 0; i < data.length; i++)
if (data[i] < min)
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-13
19:32:29 UTC (rev 20828)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-15
00:01:37 UTC (rev 20829)
@@ -7,9 +7,14 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
+Jmol.___JmolVersion="14.4.0_2015.10.14"
-Jmol.___JmolVersion="14.4.0_2015.10.13"
+bug fix: SHOW PROPERTY IDENTIFY crashes Jmol.
+
+
+JmolVersion="14.4.0_2015.10.13"
+
released
summary of 200+ new features for Jmol 14.4 -- June, 2014 - Oct. 2015 -- Bob
Hanson
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-13 19:32:29 UTC
(rev 20828)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-10-15 00:01:37 UTC
(rev 20829)
@@ -5067,10 +5067,13 @@
float min, float max)
throws ScriptException {
- float[] data = (float[]) (property == null ?
+ Object odata = (property == null ?
e.getBitsetProperty(bs, tok, null, null, null, null,
false, Integer.MAX_VALUE, false)
: vwr.getDataObj(property, bs, JmolDataManager.DATA_TYPE_AF));
+ if (odata == null || !AU.isAF(odata))
+ return new float[bs.cardinality()];
+ float[] data = (float[]) odata;
if (!Float.isNaN(min))
for (int i = 0; i < data.length; i++)
if (data[i] < min)
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-13 19:32:29 UTC
(rev 20828)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-15 00:01:37 UTC
(rev 20829)
@@ -62,9 +62,11 @@
TODO: consider if models with no atoms will cause issues in relation to
model.firstAtomIndex
+Jmol.___JmolVersion="14.5.0_2015.10.14"
-Jmol.___JmolVersion="14.5.0_2015.10.13"
+bug fix: SHOW PROPERTY IDENTIFY crashes Jmol.
+JmolVersion="14.5.0_2015.10.13"
JmolVersion="14.4.0_2015.10.13"
JmolVersion="14.3.16_2015.10.13"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
