From: <ha...@us...> - 2010-09-27 05:12:22
|
Revision: 14376 http://jmol.svn.sourceforge.net/jmol/?rev=14376&view=rev Author: hansonr Date: 2010-09-27 05:12:16 +0000 (Mon, 27 Sep 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptVariable.java Modified: trunk/Jmol/src/org/jmol/script/ScriptVariable.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-09-27 04:39:31 UTC (rev 14375) +++ trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-09-27 05:12:16 UTC (rev 14376) @@ -202,10 +202,10 @@ return new ScriptVariable(decimal, x); if (x instanceof String) { x = unescapePointOrBitsetAsVariable((String) x); + if (x instanceof ScriptVariable) + return (ScriptVariable) x; return new ScriptVariable(string, x); } - if (x instanceof ScriptVariable) - return (ScriptVariable) x; if (x instanceof Point3f) return new ScriptVariable(point3f, x); if (x instanceof Vector3f) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-10-10 15:20:28
|
Revision: 14457 http://jmol.svn.sourceforge.net/jmol/?rev=14457&view=rev Author: hansonr Date: 2010-10-10 15:20:22 +0000 (Sun, 10 Oct 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptVariable.java Modified: trunk/Jmol/src/org/jmol/script/ScriptVariable.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-10-10 15:19:32 UTC (rev 14456) +++ trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-10-10 15:20:22 UTC (rev 14457) @@ -337,8 +337,7 @@ if (v.objects != null) { objects = new ScriptVariable[n]; System.arraycopy(v.objects, 0, objects, 0, n); - } - + } break; default: value = v.value; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-10-17 20:44:04
|
Revision: 14498 http://jmol.svn.sourceforge.net/jmol/?rev=14498&view=rev Author: hansonr Date: 2010-10-17 20:43:57 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptVariable.java Modified: trunk/Jmol/src/org/jmol/script/ScriptVariable.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-10-17 20:33:55 UTC (rev 14497) +++ trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2010-10-17 20:43:57 UTC (rev 14498) @@ -280,7 +280,7 @@ objects = new ScriptVariable[ix.length]; for (int i = ix.length; --i >= 0;) { objects[i] = getVariable(ix[i]); - s[i] = "" + Escape.escape((Object)ix[i]); + s[i] = "" + Escape.escape(ix[i]); } sv = new ScriptVariable(list, s); } else if (x instanceof float[]) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-11-23 12:16:11
|
Revision: 17748 http://jmol.svn.sourceforge.net/jmol/?rev=17748&view=rev Author: hansonr Date: 2012-11-23 12:16:00 +0000 (Fri, 23 Nov 2012) Log Message: ----------- Jmol 13.1.9_dev breaks select (_O)[2] Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptVariable.java Modified: trunk/Jmol/src/org/jmol/script/ScriptVariable.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2012-11-22 18:39:56 UTC (rev 17747) +++ trunk/Jmol/src/org/jmol/script/ScriptVariable.java 2012-11-23 12:16:00 UTC (rev 17748) @@ -809,20 +809,18 @@ } int len = 0; boolean isInputSelected = (tokenIn instanceof ScriptVariable && ((ScriptVariable) tokenIn).index != Integer.MAX_VALUE); - ScriptVariable tokenOut = new ScriptVariableInt(Integer.MAX_VALUE); + ScriptVariable tokenOut = newScriptVariableIntValue(tokenIn.tok, Integer.MAX_VALUE, null); switch (tokenIn.tok) { case bitset: if (tokenIn.value instanceof BondSet) { - tokenOut.value = new BondSet((BitSet) tokenIn.value, + bs = new BondSet((BitSet) tokenIn.value, ((BondSet) tokenIn.value).getAssociatedAtoms()); - bs = (BitSet) tokenOut.value; len = BitSetUtil.cardinalityOf(bs); - break; + } else { + bs = BitSetUtil.copy((BitSet) tokenIn.value); + len = (isInputSelected ? 1 : BitSetUtil.cardinalityOf(bs)); } - bs = BitSetUtil.copy((BitSet) tokenIn.value); - len = (isInputSelected ? 1 : BitSetUtil.cardinalityOf(bs)); - tokenOut.value = bs; break; case varray: len = ((ScriptVariable)tokenIn).getList().size(); @@ -896,6 +894,7 @@ switch (tokenIn.tok) { case bitset: + tokenOut.value = bs; if (isInputSelected) { if (i1 > 1) bs.clearAll(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |