Revision: 20898
http://sourceforge.net/p/jmol/code/20898
Author: hansonr
Date: 2015-12-22 02:46:52 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.1_2015.12.21"
bug fix: color [0xffffff] should not be case-sensitive -- [0Xffffff] should be
OK
bug fix: set spin fps ... fails
code: (JavaScript) adding use of typedArray.buffer.slice
Modified Paths:
--------------
branches/v14_4/Jmol/src/javajs/util/CU.java
branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/javajs/util/CU.java
trunk/Jmol/src/org/jmol/script/ScriptEval.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/javajs/util/CU.java
===================================================================
--- branches/v14_4/Jmol/src/javajs/util/CU.java 2015-12-21 13:56:15 UTC (rev
20897)
+++ branches/v14_4/Jmol/src/javajs/util/CU.java 2015-12-22 02:46:52 UTC (rev
20898)
@@ -386,6 +386,7 @@
int len = 0;
if (strColor == null || (len = strColor.length()) == 0)
return 0;
+ strColor = strColor.toLowerCase();
if (strColor.charAt(0) == '[' && strColor.charAt(len - 1) == ']') {
String check;
if (strColor.indexOf(",") >= 0) {
@@ -420,7 +421,7 @@
return 0;
}
}
- Integer boxedArgb = mapJavaScriptColors.get(strColor.toLowerCase());
+ Integer boxedArgb = mapJavaScriptColors.get(strColor);
return (boxedArgb == null ? 0 : boxedArgb.intValue());
}
Modified: branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java 2015-12-21
13:56:15 UTC (rev 20897)
+++ branches/v14_4/Jmol/src/org/jmol/script/ScriptEval.java 2015-12-22
02:46:52 UTC (rev 20898)
@@ -6971,7 +6971,7 @@
break;
case T.spin:
sval = paramAsStr(2).toLowerCase();
- switch ("x;y;z;fps".indexOf(sval + ";")) {
+ switch ("x;y;z;fps;".indexOf(sval + ";")) {
case 0:
newTok = T.spinx;
break;
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-21
13:56:15 UTC (rev 20897)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-22
02:46:52 UTC (rev 20898)
@@ -7,9 +7,17 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.1_2015.12.20"
+Jmol.___JmolVersion="14.4.1_2015.12.21"
+bug fix: color [0xffffff] should not be case-sensitive -- [0Xffffff] should be
OK
+bug fix: set spin fps ... fails
+
+code: (JavaScript) adding use of typedArray.buffer.slice
+
+JmolVersion="14.4.1_2015.12.20"
+
code: (JavaScript) adding use of array.slice and implementing Java byte[] as
JavaScript Int8Array()
+
bug fix: array handling for labels very inefficient
bug fix: y = javascript("x") only creates string equivalent of x, not actual
numerical/object values
bug fix: y = javascript("x") draws "x" from wrapped anonymous function using
eval() instead of global context using window.eval()
Modified: trunk/Jmol/src/javajs/util/CU.java
===================================================================
--- trunk/Jmol/src/javajs/util/CU.java 2015-12-21 13:56:15 UTC (rev 20897)
+++ trunk/Jmol/src/javajs/util/CU.java 2015-12-22 02:46:52 UTC (rev 20898)
@@ -386,6 +386,7 @@
int len = 0;
if (strColor == null || (len = strColor.length()) == 0)
return 0;
+ strColor = strColor.toLowerCase();
if (strColor.charAt(0) == '[' && strColor.charAt(len - 1) == ']') {
String check;
if (strColor.indexOf(",") >= 0) {
@@ -420,7 +421,7 @@
return 0;
}
}
- Integer boxedArgb = mapJavaScriptColors.get(strColor.toLowerCase());
+ Integer boxedArgb = mapJavaScriptColors.get(strColor);
return (boxedArgb == null ? 0 : boxedArgb.intValue());
}
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-12-21 13:56:15 UTC
(rev 20897)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-12-22 02:46:52 UTC
(rev 20898)
@@ -6977,7 +6977,7 @@
break;
case T.spin:
sval = paramAsStr(2).toLowerCase();
- switch ("x;y;z;fps".indexOf(sval + ";")) {
+ switch ("x;y;z;fps;".indexOf(sval + ";")) {
case 0:
newTok = T.spinx;
break;
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-21 13:56:15 UTC
(rev 20897)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-12-22 02:46:52 UTC
(rev 20898)
@@ -62,8 +62,13 @@
TODO: consider if models with no atoms will cause issues in relation to
model.firstAtomIndex
-Jmol.___JmolVersion="14.5.1_2015.12.20"
+Jmol.___JmolVersion="14.5.1_2015.12.21"
+bug fix: color [0xffffff] should not be case-sensitive -- [0Xffffff] should be
OK
+bug fix: set spin fps ... fails
+
+JmolVersion="14.5.1_2015.12.20"
+
code: (JavaScript) adding use of array.slice and implementing Java byte[] as
JavaScript Int8Array()
bug fix: array handling for labels very inefficient
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
