From: <ha...@us...> - 2009-08-31 04:28:14
|
Revision: 11412 http://jmol.svn.sourceforge.net/jmol/?rev=11412&view=rev Author: hansonr Date: 2009-08-31 04:28:07 +0000 (Mon, 31 Aug 2009) Log Message: ----------- version=11.9.1_dev # bug fix: 2D mesh property not cleared Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-08-31 04:25:22 UTC (rev 11411) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-08-31 04:28:07 UTC (rev 11412) @@ -68,7 +68,7 @@ /* * The ScriptEvaluator class, the Viewer, the xxxxManagers, the - * Graphics3D rendeing engine, the Shape classes, and the Adapter file + * Graphics3D rendering engine, the ModelSet and Shape classes, and the Adapter file * reader classes form the core of the Jmol molecular visualization framework. * * The ScriptEvaluator has just a few entry points, which you will find This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-09-09 02:01:51
|
Revision: 11518 http://jmol.svn.sourceforge.net/jmol/?rev=11518&view=rev Author: hansonr Date: 2009-09-09 02:01:44 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-09-09 00:22:14 UTC (rev 11517) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-09-09 02:01:44 UTC (rev 11518) @@ -6693,7 +6693,7 @@ if (errMsg != null && !isCmdLine_c_or_C_Option) { if (errMsg.indexOf("NOTE: file recognized as a script file:") == 0) { viewer.addLoadScript("-"); - runScript("script " + errMsg.substring(40)); + runScript("script \"" + errMsg.substring(40) + "\""); return; } evalError(errMsg, null); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-09-09 02:50:20
|
Revision: 11519 http://jmol.svn.sourceforge.net/jmol/?rev=11519&view=rev Author: hansonr Date: 2009-09-09 02:50:07 +0000 (Wed, 09 Sep 2009) Log Message: ----------- # new feature: $SCRIPT_PATH$ prefix to file name uses path of script Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-09-09 02:01:44 UTC (rev 11518) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-09-09 02:50:07 UTC (rev 11519) @@ -1573,12 +1573,7 @@ private boolean compileScript(String filename, String strScript, boolean debugCompiler) { this.filename = filename; - if (strScript.indexOf("$SCRIPT_PATH$") >= 0 && filename != null) { - String path = filename; - int pt = Math.max(filename.lastIndexOf("|"), filename.lastIndexOf("/")); - path = path.substring(0, pt + 1); - strScript = TextFormat.simpleReplace(strScript, "$SCRIPT_PATH$/", path); - } + strScript = fixScriptPath(strScript, filename); getScriptContext(compiler.compile(filename, strScript, false, false, debugCompiler, false), false); isStateScript = (script.indexOf(Viewer.STATE_VERSION_STAMP) >= 0); @@ -1591,6 +1586,18 @@ return !error; } + private String fixScriptPath(String strScript, String filename) { + if (filename != null && strScript.indexOf("$SCRIPT_PATH$") >= 0) { + String path = filename; + int pt = Math.max(filename.lastIndexOf("|"), filename.lastIndexOf("/")); + path = path.substring(0, pt + 1); + strScript = TextFormat.simpleReplace(strScript, "$SCRIPT_PATH$/", path); + if (path.length() > 0) + strScript = TextFormat.simpleReplace(strScript, "$SCRIPT_PATH$", path.substring(0, path.length() - 1)); + } + return strScript; + } + private int setScriptExtensions() { String extensions = scriptExtensions; if (extensions == null) @@ -1630,11 +1637,12 @@ return false; } this.filename = filename; + String script = fixScriptPath(data[1], filename); if (localPath != null) - data[1] = FileManager.setScriptFileReferences(data[1], localPath, true); + script = FileManager.setScriptFileReferences(script, localPath, true); if (remotePath != null) - data[1] = FileManager.setScriptFileReferences(data[1], remotePath, false); - return compileScript(filename, data[1], debugScript); + script = FileManager.setScriptFileReferences(script, remotePath, false); + return compileScript(filename, script, debugScript); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-10 21:04:51
|
Revision: 11715 http://jmol.svn.sourceforge.net/jmol/?rev=11715&view=rev Author: hansonr Date: 2009-11-10 21:04:44 +0000 (Tue, 10 Nov 2009) Log Message: ----------- version=11.9.8_dev, more token business, # bug fix: strand count assignment error in cif/pdb readers causes failure to load 3ovo.cif Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-10 20:23:01 UTC (rev 11714) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-10 21:04:44 UTC (rev 11715) @@ -1979,6 +1979,13 @@ // they will be processed differently. // a filename with only letters and numbers will be // read incorrectly here as an identifier. + + // note that command keywords cannot be implemented as variables + // because they are not Token.identifiers in the first place. + // but the identifier tok is important here because just below + // there is a check for SET parameter name assignments. + // even those may not work... + tok = (isClauseDefine || forceString || s.indexOf(".") >= 0 || s.indexOf(" ") >= 0 || s.indexOf("=") >= 0 @@ -2742,10 +2749,8 @@ } else if (token.intValue != Integer.MAX_VALUE) sb.append(Token.nameOf(token.intValue)).append(" "); break; - case Token.identifier: - break; default: - if (!logMessages) + if (Token.tokAttr(token.tok, Token.identifier) || !logMessages) break; sb.append('\n').append(token.toString()).append('\n'); continue; @@ -3081,7 +3086,7 @@ } else if (val instanceof String) { if (tokWhat == Token.color) { comparisonValue = Graphics3D.getArgbFromString((String) val); - if (comparisonValue == 0 && tokValue == Token.identifier) { + if (comparisonValue == 0 && Token.tokAttr(tokValue, Token.identifier)) { val = getStringParameter((String) val, true); if (((String)val).startsWith("{")) { val = Escape.unescapePoint((String) val); @@ -3096,10 +3101,10 @@ tokValue = Token.integer; isIntProperty = true; } else if (isStringProperty) { - if (tokValue == Token.identifier) + if (Token.tokAttr(tokValue, Token.identifier)) val = getStringParameter((String) val, true); } else { - if (tokValue == Token.identifier || Token.tokAttr(tokValue, Token.misc)) + if (Token.tokAttr(tokValue, Token.identifier)) val = getNumericParameter((String) val); if (val instanceof String) { if (tokWhat == Token.structure || tokWhat == Token.element) @@ -3965,8 +3970,10 @@ private boolean isColorParam(int i) { int tok = tokAt(i); - return (tok == Token.leftsquare || tok == Token.point3f || isPoint3f(i) || (tok == Token.string || tok == Token.identifier) - && Graphics3D.getArgbFromString((String) statement[i].value) != 0); + return (tok == Token.leftsquare || tok == Token.point3f + || isPoint3f(i) || (tok == Token.string + || Token.tokAttr(tok, Token.identifier)) + && Graphics3D.getArgbFromString((String) statement[i].value) != 0); } private int getArgbParam(int index) throws ScriptException { @@ -3984,8 +3991,10 @@ Point3f pt = null; if (checkToken(index)) { switch (getToken(index).tok) { - case Token.identifier: - case Token.string: + default: + if (theTok != Token.string + && !Token.tokAttr(theTok, Token.identifier)) + break; return Graphics3D.getArgbFromString(parameterAsString(index)); case Token.leftsquare: return getColorTriad(++index); @@ -5451,8 +5460,7 @@ } for (int i = index; i < statementLength; ++i) { - int tok = getToken(i).tok; - switch (tok) { + switch (getToken(i).tok) { case Token.on: case Token.off: checkLength(2); @@ -5496,7 +5504,7 @@ i = iToken; break; case Token.color: - tok = tokAt(i + 1); + int tok = tokAt(i + 1); if (tok != Token.translucent && tok != Token.opaque) ptColor = i + 1; continue; @@ -5528,8 +5536,8 @@ haveOperation = true; if (++i != statementLength) error(ERROR_invalidParameterOrder); - operation = tok; - if (tok == Token.auto + operation = theTok; + if (theTok == Token.auto && !(bondOrder == JmolConstants.BOND_ORDER_NULL || bondOrder == JmolConstants.BOND_H_REGULAR || bondOrder == JmolConstants.BOND_AROMATIC)) error(ERROR_invalidArgument); @@ -6964,9 +6972,8 @@ Vector monitorExpressions = new Vector(); BitSet bs = new BitSet(); Object value = null; - int tok; for (int i = 1; i < statementLength; ++i) { - switch (tok = getToken(i).tok) { + switch (getToken(i).tok) { default: error(ERROR_expressionOrIntegerExpected); case Token.on: @@ -6994,7 +7001,7 @@ continue; case Token.allconnected: case Token.all: - isAllConnected = (tok == Token.allconnected); + isAllConnected = (theTok == Token.allconnected); atomIndex = -1; isAll = true; continue; @@ -8100,8 +8107,7 @@ private void ellipsoid() throws ScriptException { int mad = 0; int i = 1; - int tok; - switch (tok = getToken(1).tok) { + switch (getToken(1).tok) { case Token.on: mad = 50; break; @@ -8114,7 +8120,7 @@ case Token.times: case Token.identifier: viewer.loadShape(JmolConstants.SHAPE_ELLIPSOIDS); - if (tok == Token.id) + if (theTok == Token.id) i++; setShapeId(JmolConstants.SHAPE_ELLIPSOIDS, i, false); i = iToken; @@ -9078,20 +9084,19 @@ private void frameControl(int i, boolean isSubCmd) throws ScriptException { checkLength(i + 1); - int tok = getToken(i).tok; - switch (tok) { - case Token.playrev: - case Token.play: - case Token.resume: - case Token.pause: - case Token.next: - case Token.prev: - case Token.rewind: - case Token.last: - if (!isSyntaxCheck) - viewer.setAnimation(tok); - return; - } + switch (getToken(i).tok) { + case Token.playrev: + case Token.play: + case Token.resume: + case Token.pause: + case Token.next: + case Token.prev: + case Token.rewind: + case Token.last: + if (!isSyntaxCheck) + viewer.setAnimation(theTok); + return; + } error(ERROR_invalidArgument); } @@ -9840,11 +9845,11 @@ private void setEcho() throws ScriptException { String propertyName = "target"; Object propertyValue = null; + System.out.println("scripteval test setecho"); boolean echoShapeActive = true; // set echo xxx int len = 3; - int tok = getToken(2).tok; - switch (tok) { + switch (getToken(2).tok) { case Token.off: checkLength(3); echoShapeActive = false; @@ -9899,7 +9904,7 @@ echo(2, false); return; default: - if (!Token.tokAttr(tok, Token.identifier)) + if (!Token.tokAttr(theTok, Token.identifier)) error(ERROR_invalidArgument); propertyValue = parameterAsString(2); break; @@ -9941,8 +9946,16 @@ propertyName = "model"; propertyValue = new Integer(modelIndex); break; + case Token.left: + case Token.right: + case Token.top: + case Token.bottom: + case Token.center: + case Token.identifier: + propertyValue = parameterAsString(3); + break; default: - if (!Token.tokAttr(tok, Token.identifier)) + if (!Token.tokAttr(theTok, Token.identifier)) error(ERROR_invalidArgument); propertyValue = parameterAsString(3); break; @@ -11563,8 +11576,7 @@ } String propertyName = null; Object propertyValue = null; - int tok = getToken(i).tok; - switch (tok) { + switch (getToken(i).tok) { case Token.opEQ: case Token.comma: continue; @@ -11605,7 +11617,7 @@ case Token.collapsed: case Token.flat: propertyName = "collapsed"; - propertyValue = (tok == Token.collapsed ? Boolean.TRUE : Boolean.FALSE); + propertyValue = (theTok == Token.collapsed ? Boolean.TRUE : Boolean.FALSE); if (typeSeen) error(ERROR_incompatibleArguments); typeSeen = true; @@ -12158,11 +12170,11 @@ } String propertyName = null; Object propertyValue = null; - int tok = getToken(i).tok; - if (tok == Token.identifier + getToken(i); + if (theTok == Token.identifier && (str = parameterAsString(i)).equalsIgnoreCase("inline")) - tok = Token.string; - switch (tok) { + theTok = Token.string; + switch (theTok) { case Token.pmesh: setShapeProperty(iShape, "fileType", "Pmesh"); continue; @@ -12535,7 +12547,7 @@ case Token.debug: case Token.nodebug: propertyName = "debug"; - propertyValue = (tok == Token.debug ? Boolean.TRUE : Boolean.FALSE); + propertyValue = (theTok == Token.debug ? Boolean.TRUE : Boolean.FALSE); break; case Token.fixed: propertyName = "fixed"; @@ -12848,7 +12860,7 @@ surfaceObjectSeen = true; } if (!setMeshDisplayProperty(iShape, i, theTok)) { - if (Token.tokAttr(tok, Token.identifier) && !idSeen) { + if (Token.tokAttr(theTok, Token.identifier) && !idSeen) { setShapeId(iShape, i, idSeen); i = iToken; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-10 21:33:40
|
Revision: 11716 http://jmol.svn.sourceforge.net/jmol/?rev=11716&view=rev Author: hansonr Date: 2009-11-10 21:33:28 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-10 21:04:44 UTC (rev 11715) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-10 21:33:28 UTC (rev 11716) @@ -9845,7 +9845,6 @@ private void setEcho() throws ScriptException { String propertyName = "target"; Object propertyValue = null; - System.out.println("scripteval test setecho"); boolean echoShapeActive = true; // set echo xxx int len = 3; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-12 13:38:14
|
Revision: 11732 http://jmol.svn.sourceforge.net/jmol/?rev=11732&view=rev Author: hansonr Date: 2009-11-12 13:38:02 +0000 (Thu, 12 Nov 2009) Log Message: ----------- version=11.9.9_dev # bug fix: moveto with {0 0 0 0} uses instead {0 0 1 0} Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 13:33:17 UTC (rev 11731) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 13:38:02 UTC (rev 11732) @@ -4990,9 +4990,10 @@ Point4f pt4 = getPoint4f(i); i = iToken + 1; axis.set(pt4.x, pt4.y, pt4.z); - degrees = (pt4.x == 0 && pt4.y == 0 && pt4.x == 0 && pt4.w == 0 - ? Float.NaN : pt4.w); + degrees = pt4.w; } + if (axis.length() == 0 && degrees == 0) + degrees = Float.NaN; break; case Token.front: axis.set(1, 0, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-12 13:56:04
|
Revision: 11733 http://jmol.svn.sourceforge.net/jmol/?rev=11733&view=rev Author: hansonr Date: 2009-11-12 13:55:48 +0000 (Thu, 12 Nov 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 13:38:02 UTC (rev 11732) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 13:55:48 UTC (rev 11733) @@ -7904,8 +7904,7 @@ float yTrans = Float.NaN; if (i != statementLength) { xTrans = floatParameter(i++); - if (i != statementLength) - yTrans = floatParameter(i++); + yTrans = floatParameter(i++); } if (i != statementLength) error(ERROR_invalidArgument); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-12 14:01:46
|
Revision: 11734 http://jmol.svn.sourceforge.net/jmol/?rev=11734&view=rev Author: hansonr Date: 2009-11-12 14:01:02 +0000 (Thu, 12 Nov 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 13:55:48 UTC (rev 11733) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-12 14:01:02 UTC (rev 11734) @@ -4931,7 +4931,7 @@ Float.NaN, Float.NaN, Float.NaN); return; } - Vector3f axis = new Vector3f(); + Vector3f axis = new Vector3f(Float.NaN, 0, 0); Point3f center = null; int i = 1; float floatSecondsTotal = (isFloatParameter(i) ? floatParameter(i++) : 2.0f); @@ -4941,7 +4941,8 @@ case Token.quaternion: Quaternion q; boolean isMolecular = false; - if (optParameterAsString(++i).equalsIgnoreCase("molecular")) { + if (tokAt(++i) == Token.molecular) { + // see comment below isMolecular = true; i++; } @@ -4992,8 +4993,6 @@ axis.set(pt4.x, pt4.y, pt4.z); degrees = pt4.w; } - if (axis.length() == 0 && degrees == 0) - degrees = Float.NaN; break; case Token.front: axis.set(1, 0, 0); @@ -5030,6 +5029,10 @@ floatParameter(i++)); degrees = floatParameter(i++); } + if (Float.isNaN(axis.x)) + axis.set(0, 0, 0); + else if (axis.length() == 0 && degrees == 0) + degrees = Float.NaN; boolean isChange = !viewer.isInPosition(axis, degrees); // optional zoom float zoom = (isFloatParameter(i) ? floatParameter(i++) : Float.NaN); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-19 23:03:54
|
Revision: 11765 http://jmol.svn.sourceforge.net/jmol/?rev=11765&view=rev Author: hansonr Date: 2009-11-19 23:03:47 +0000 (Thu, 19 Nov 2009) Log Message: ----------- version=11.9.9_dev # new feature: preliminary customizable mouse bindings: # # bind "MOUSE-ACTION" actionName|"...some script..." # unbind ["MOUSE-ACTION"|all] [actionName|all|"...some script..."] # # mouse actions include: # # CTRL ALT SHIFT LEFT RIGHT MIDDLE WHEEL DOUBLE SINGLE # # action names include: # # _rotate _wheelZoom _rotateZ _rotateZorZoom _translate _slideZoom # _dragSelected _rotateSelected _dragLabel _dragDrawPoint _dragDrawObject # _swipe _spinDrawObjectCW _spinDrawObjectCCW _slab _depth _slabAndDepth # _popupMenu _clickFrank _navTranslate _pickAtom _pickPoint _pickLabel # _pickMeasure _setMeasure _pickIsosurface _pickNavigate _select # _selectNone _selectToggle _selectAndNot _selectOr _selectToggleOr # _reset # # for example: # # bind "CTRL-ALT-LEFT" _popupMenu # unbind "CTRL-ALT-LEFT" _popupMenu # unbind _clickFrank # unbind "CTRL-ALT-LEFT" # # Note that by binding a script to the mouse action, you can divert # Jmol's action to be your own. The script can contain variables # _X, _Y, _DELTAX, _DELTAY, _TIME, and _MODE # which will be filled with data. _MODE values include: # 0 (mouse pressed) # 1 (mouse dragged) # 2 (mouse released) # 3 (mouse wheeled) # Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-19 22:49:04 UTC (rev 11764) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-19 23:03:47 UTC (rev 11765) @@ -4754,10 +4754,10 @@ break; case Token.bind: bind(); - return; + break; case Token.unbind: unbind(); - return; + break; default: error(ERROR_unrecognizedCommand); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-22 12:11:51
|
Revision: 11774 http://jmol.svn.sourceforge.net/jmol/?rev=11774&view=rev Author: hansonr Date: 2009-11-22 12:11:42 +0000 (Sun, 22 Nov 2009) Log Message: ----------- version=11.9.10_dev # code: refactoring of FileManager and clean-up of Viewer code # in relation to model loading. Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-22 00:05:41 UTC (rev 11773) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-11-22 12:11:42 UTC (rev 11774) @@ -6758,6 +6758,9 @@ false)); filename = "string"; } + } + errMsg = viewer.loadModelFromFile(filename, filenames, isAppend, htParams, tokType); + if (filenames == null) { loadScript.append(" "); if (!filename.equals("string") && !filename.equals("string[]")) loadScript.append("/*file*/"); @@ -6765,7 +6768,6 @@ .get("fullPathName"))); loadScript.append(sOptions); } - errMsg = viewer.loadModelFromFile(filename, filenames, isAppend, htParams, tokType); if (tokType == 0) viewer.addLoadScript(loadScript.toString()); if (errMsg != null && !isCmdLine_c_or_C_Option) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-12-18 22:52:45
|
Revision: 11936 http://jmol.svn.sourceforge.net/jmol/?rev=11936&view=rev Author: hansonr Date: 2009-12-18 22:52:34 +0000 (Fri, 18 Dec 2009) Log Message: ----------- version=11.9.12_dev # new feature: axes labels "x" "y" "z" # new feature: axes labels ON # new feature: axes labels OFF # new feature: axes ticks [x|y|z] {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx # new feature: boundbox ticks [x|y|z] {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx first x.xxx # new feature: measure ticks {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx first x.xxx {point1} {point2} # new feature: unitcell ticks ..... with special option "scale hkl" to indicate unit cell dimension scaling Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-12-18 21:46:59 UTC (rev 11935) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-12-18 22:52:34 UTC (rev 11936) @@ -3701,7 +3701,13 @@ throws ScriptException { switch (tokAt(i)) { case Token.string: - return new String[] {stringParameter(i)}; + String s = stringParameter(i); + if (s.startsWith("[\"")) { + Object o = viewer.evaluateExpression(s); + if (o instanceof String) + return TextFormat.split((String) o, '\n'); + } + return new String[] { s }; case Token.leftsquare: ++i; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-12-18 23:02:19
|
Revision: 11937 http://jmol.svn.sourceforge.net/jmol/?rev=11937&view=rev Author: hansonr Date: 2009-12-18 23:02:11 +0000 (Fri, 18 Dec 2009) Log Message: ----------- version=11.9.12_dev # new feature: axes labels "x" "y" "z" # new feature: axes labels ON # new feature: axes labels OFF # new feature: axes ticks [x|y|z] {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx # new feature: boundbox ticks [x|y|z] {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx first x.xxx # new feature: measure ticks {major,minor,subminor} format ["%0.2f", ...] scale {x y z}|x.xx first x.xxx {point1} {point2} # new feature: unitcell ticks ..... with special option "scale hkl" to indicate unit cell dimension scaling Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-12-18 22:52:34 UTC (rev 11936) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2009-12-18 23:02:11 UTC (rev 11937) @@ -10016,7 +10016,7 @@ if (isFloatParameter(iToken + 2)) { float f = floatParameter(iToken + 2); tickInfo.scale = new Point3f(f, f, f); - } else if (tokAt(iToken + 2) == Token.hkl) { + } else if (tokAt(iToken + 2) == Token.unitcell) { tickInfo.scale = new Point3f( 1/viewer.getUnitCellInfo(JmolConstants.INFO_A), 1/viewer.getUnitCellInfo(JmolConstants.INFO_B), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-01-10 05:56:58
|
Revision: 12077 http://jmol.svn.sourceforge.net/jmol/?rev=12077&view=rev Author: hansonr Date: 2010-01-10 05:56:51 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-01-10 05:32:32 UTC (rev 12076) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-01-10 05:56:51 UTC (rev 12077) @@ -8395,6 +8395,7 @@ } switch (tok) { + case Token.auto: case Token.rasmol: case Token.babel: case Token.babel21: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-01-25 20:40:57
|
Revision: 12223 http://jmol.svn.sourceforge.net/jmol/?rev=12223&view=rev Author: hansonr Date: 2010-01-25 20:40:36 +0000 (Mon, 25 Jan 2010) Log Message: ----------- version=11.9.22_dev # bug fix: isosurface vdw does not use "auto" # buf cix: isosurface 100% translucent skips "translucent" Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-01-25 20:31:52 UTC (rev 12222) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-01-25 20:40:36 UTC (rev 12223) @@ -8528,7 +8528,7 @@ int type = RadiusData.TYPE_ABSOLUTE; int vdwType = 0; - int tok = tokAt(index); + int tok = getToken(index).tok; switch (tok) { case Token.adpmax: case Token.adpmin: @@ -8585,6 +8585,9 @@ type = RadiusData.TYPE_FACTOR; } break; + default: + if (value == 1) + index--; } if (vdwType == 0) { iToken = index; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-02-08 12:56:09
|
Revision: 12330 http://jmol.svn.sourceforge.net/jmol/?rev=12330&view=rev Author: hansonr Date: 2010-02-08 12:56:01 +0000 (Mon, 08 Feb 2010) Log Message: ----------- version=11.9.26_dev # bug fix: Rasmol radii broken. Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-08 12:55:21 UTC (rev 12329) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-08 12:56:01 UTC (rev 12330) @@ -8668,7 +8668,7 @@ if (value > 749 || value < -200) integerOutOfRange(-200, 749); if (value > 0) { - value /= 2500; + value /= 250; type = RadiusData.TYPE_ABSOLUTE; } else { value /= 100; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-02-08 13:36:10
|
Revision: 12332 http://jmol.svn.sourceforge.net/jmol/?rev=12332&view=rev Author: hansonr Date: 2010-02-08 13:01:11 +0000 (Mon, 08 Feb 2010) Log Message: ----------- version=11.9.26_dev # bug fix: Rasmol radii broken. Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-08 12:59:13 UTC (rev 12331) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-08 13:01:11 UTC (rev 12332) @@ -8671,7 +8671,7 @@ value /= 250; type = RadiusData.TYPE_ABSOLUTE; } else { - value /= 100; + value /= -100; type = RadiusData.TYPE_FACTOR; } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-02-23 12:36:21
|
Revision: 12456 http://jmol.svn.sourceforge.net/jmol/?rev=12456&view=rev Author: hansonr Date: 2010-02-23 12:36:15 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-23 12:35:34 UTC (rev 12455) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-02-23 12:36:15 UTC (rev 12456) @@ -13880,7 +13880,8 @@ } s += " created with cutoff = " + cutoff + " ; number of isosurfaces = " + n; - if (dataRange != null && dataRange[0] != dataRange[1]) + if (dataRange != null && dataRange[0] != Float.MAX_VALUE + && dataRange[0] != dataRange[1]) s += "\ncolor range " + dataRange[2] + " " + dataRange[3] + "; mapped data range " + dataRange[0] + " to " + dataRange[1]; if (doCalcArea) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-09 20:03:32
|
Revision: 12583 http://jmol.svn.sourceforge.net/jmol/?rev=12583&view=rev Author: hansonr Date: 2010-03-09 20:03:21 +0000 (Tue, 09 Mar 2010) Log Message: ----------- version=11.9.33_dev # new feature: .x, .y, .z all work as well as .atomx, .atomy, .atomz Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-09 19:59:03 UTC (rev 12582) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-09 20:03:21 UTC (rev 12583) @@ -5384,7 +5384,8 @@ if (isSyntaxCheck) return; viewer.setObjectMad(JmolConstants.SHAPE_AXES, "axes", 1); - setShapeProperty(JmolConstants.SHAPE_AXES, "position", new Point3f(50, 50, Float.MAX_VALUE)); + setShapeProperty(JmolConstants.SHAPE_AXES, "position", new Point3f(50, + 50, Float.MAX_VALUE)); setBooleanProperty("navigationMode", true); viewer.setNavOn(theTok == Token.on); return; @@ -5459,9 +5460,8 @@ if (isFloatParameter(++i)) { x = floatParameter(i); y = floatParameter(++i); - } else if (getToken(i).tok == Token.identifier) { - String str = parameterAsString(i); - switch(tokAt(i)) { + } else { + switch (tokAt(i)) { case Token.x: x = floatParameter(++i); break; @@ -5469,14 +5469,12 @@ y = floatParameter(++i); break; default: - error(ERROR_invalidArgument); + pt = centerParameter(i); + i = iToken; + if (!isSyntaxCheck) + viewer.navTranslate(timeSec, pt); + continue; } - } else { - pt = centerParameter(i); - i = iToken; - if (!isSyntaxCheck) - viewer.navTranslate(timeSec, pt); - continue; } if (!isSyntaxCheck) viewer.navTranslatePercent(timeSec, x, y); @@ -5518,8 +5516,8 @@ if (isSyntaxCheck) return; setShapeProperty(JmolConstants.SHAPE_DRAW, "thisID", pathID); - path = (Point3f[]) viewer.getShapeProperty( - JmolConstants.SHAPE_DRAW, "vertices"); + path = (Point3f[]) viewer.getShapeProperty(JmolConstants.SHAPE_DRAW, + "vertices"); refresh(); if (path == null) error(ERROR_invalidArgument); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-09 20:07:03
|
Revision: 12584 http://jmol.svn.sourceforge.net/jmol/?rev=12584&view=rev Author: hansonr Date: 2010-03-09 20:06:52 +0000 (Tue, 09 Mar 2010) Log Message: ----------- version=11.9.33_dev # new feature: .x, .y, .z all work as well as .atomx, .atomy, .atomz Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-09 20:03:21 UTC (rev 12583) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-09 20:06:52 UTC (rev 12584) @@ -12564,25 +12564,24 @@ isosurface(JmolConstants.SHAPE_LCAOCARTOON); return; case Token.rotate: - Vector3f rotAxis = new Vector3f(); + float degx = 0; + float degy = 0; + float degz = 0; switch (getToken(++i).tok) { case Token.x: - rotAxis.set(floatParameter(++i) - * JmolConstants.radiansPerDegree, 0, 0); + degx = floatParameter(++i) * JmolConstants.radiansPerDegree; break; case Token.y: - rotAxis.set(0, floatParameter(++i) - * JmolConstants.radiansPerDegree, 0); + degy = floatParameter(++i) * JmolConstants.radiansPerDegree; break; case Token.z: - rotAxis.set(0, 0, floatParameter(++i) - * JmolConstants.radiansPerDegree); + degz = floatParameter(++i) * JmolConstants.radiansPerDegree; break; default: error(ERROR_invalidArgument); } propertyName = "rotationAxis"; - propertyValue = rotAxis; + propertyValue = new Vector3f(degx, degy, degz); break; case Token.on: case Token.display: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-10 19:18:15
|
Revision: 12590 http://jmol.svn.sourceforge.net/jmol/?rev=12590&view=rev Author: hansonr Date: 2010-03-10 19:18:09 +0000 (Wed, 10 Mar 2010) Log Message: ----------- version=11.9.33_dev # bug fix: using --i instead of i-- with for causes infinite loop Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-10 17:51:23 UTC (rev 12589) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-10 19:18:09 UTC (rev 12590) @@ -5077,10 +5077,16 @@ j++; } String key = parameterAsString(j); + boolean isMinusMinus = key.equals("--") || key.equals("++"); + if (isMinusMinus) { + key = parameterAsString(++j); + } if (Token.tokAttr(tokAt(j), Token.misc) || getContextVariableAsVariable(key) != null) { - if (bsIn == null && getToken(++j).tok != Token.opEQ) + if (bsIn == null && !isMinusMinus && getToken(++j).tok != Token.opEQ) error(ERROR_invalidArgument); if (bsIn == null) { + if (isMinusMinus) + j -= 2; setVariable(++j, statementLength - 1, key, 0); } else { setVariable(j + 2, statementLength - 1, key + "_set", 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-16 14:59:13
|
Revision: 12634 http://jmol.svn.sourceforge.net/jmol/?rev=12634&view=rev Author: hansonr Date: 2010-03-16 14:59:06 +0000 (Tue, 16 Mar 2010) Log Message: ----------- version=11.9.34_dev # new feature: COMPARE command (was ALIGN) # compare {model1} {model2} [orientations] # compare {model1} {model2} [orientations] {bsAtoms1} {bsAtoms2} # compare {model1} {model2} atoms {bsAtoms1} {bsAtoms2} # compare {model1} {model2} [orientations] [quaternionList1] [quaternionList2] # additional options ROTATE and/or TRANSLATE Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-16 12:17:45 UTC (rev 12633) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-16 14:59:06 UTC (rev 12634) @@ -5714,6 +5714,7 @@ : BitSetUtil.copy(bsAtoms1)); bsAtoms1.and(bsFrom); bsAtoms2.and(bsTo); + i = iToken; break; case Token.list: isQuaternion = true; @@ -5762,10 +5763,11 @@ showString("RMSD = " + retStddev[0] + " Angstroms"); } Point3f pt1 = new Point3f(); + Point3f pt0 = new Point3f(viewer.getAtomSetCenter(bsAtoms1)); if (doRotate) { if (q == null) evalError("option not implemented", null); - Point3f pt0 = new Point3f(); + pt1.set(pt0); pt1.add(q.getNormal()); float degrees = q.getTheta(); viewer.rotateAboutPointsInternal(pt0, pt1, degrees, Float.MAX_VALUE, @@ -5773,7 +5775,7 @@ } if (doTranslate) { pt1 = viewer.getAtomSetCenter(bsAtoms2); - pt1.sub(viewer.getAtomSetCenter(bsAtoms1)); + pt1.sub(pt0); viewer.setAtomCoordRelative(pt1, bsFrom); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-16 18:21:31
|
Revision: 12635 http://jmol.svn.sourceforge.net/jmol/?rev=12635&view=rev Author: hansonr Date: 2010-03-16 18:21:15 +0000 (Tue, 16 Mar 2010) Log Message: ----------- # new feature: COMPARE command (was ALIGN) # compare {model1} {model2} [orientations] # compare {model1} {model2} [orientations] {bsAtoms1} {bsAtoms2} # compare {model1} {model2} atoms {bsAtoms1} {bsAtoms2} # compare {model1} {model2} [orientations] [quaternionList1] [quaternionList2] # additional options ROTATE and/or TRANSLATE Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-16 14:59:06 UTC (rev 12634) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-16 18:21:15 UTC (rev 12635) @@ -5697,14 +5697,14 @@ // compare {model1} {model2} [orientations] {bsAtoms1} {bsAtoms2} // compare {model1} {model2} atoms {bsAtoms1} {bsAtoms2} // compare {model1} {model2} [orientations] [quaternionList1] [quaternionList2] + boolean isQuaternion = true; + boolean doRotate = false; + boolean doTranslate = false; + Quaternion[] data1 = null, data2 = null; BitSet bsFrom = expression(1); BitSet bsTo = expression(++iToken); BitSet bsAtoms1 = bsFrom; BitSet bsAtoms2 = bsTo; - boolean isQuaternion = true; - boolean doRotate = false; - boolean doTranslate = false; - Quaternion[] data1 = null, data2 = null; for (int i = iToken + 1; i < statementLength; ++i) { switch (getToken(i).tok) { case Token.bitset: @@ -5720,14 +5720,14 @@ isQuaternion = true; if (data1 == null) data1 = ScriptMathProcessor - .getQuaternionArray((Object[]) getToken(iToken).value); + .getQuaternionArray((Object[]) theToken.value); else if (data2 == null) data2 = ScriptMathProcessor - .getQuaternionArray((Object[]) getToken(++iToken).value); + .getQuaternionArray((Object[]) theToken.value); else error(ERROR_invalidArgument); break; - case Token.quaternion: + case Token.orientation: isQuaternion = true; break; case Token.atoms: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-20 15:13:52
|
Revision: 12659 http://jmol.svn.sourceforge.net/jmol/?rev=12659&view=rev Author: hansonr Date: 2010-03-20 15:13:46 +0000 (Sat, 20 Mar 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-20 15:10:23 UTC (rev 12658) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-20 15:13:46 UTC (rev 12659) @@ -6242,6 +6242,7 @@ case Token.property: theTok = Token.atoms; i = 1; + break; case Token.string: String strColor = stringParameter(1); boolean isTranslucent = (tokAt(2) == Token.translucent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-22 16:16:00
|
Revision: 12672 http://jmol.svn.sourceforge.net/jmol/?rev=12672&view=rev Author: hansonr Date: 2010-03-22 16:15:54 +0000 (Mon, 22 Mar 2010) Log Message: ----------- version=11.9.36_dev # bug fix: show symop by itself AFTER show symop n does not show full list Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-22 15:16:53 UTC (rev 12671) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-22 16:15:54 UTC (rev 12672) @@ -11646,16 +11646,8 @@ if (token != null) tok = token.tok; } - if (tok == Token.symop && statementLength > 3) { - Point3f pt1 = centerParameter(2); - Point3f pt2 = centerParameter(++iToken); - if (isSyntaxCheck) - return; - len = ++iToken; - msg = viewer.getSymmetryOperation(null, 0, pt1, pt2); - } else { + if (tok != Token.symop || statementLength <= 3) checkLength(-3); - } if (statementLength == 2 && str.indexOf("?") >= 0) { showString(viewer.getAllSettings(str.substring(0, str.indexOf("?")))); return; @@ -11665,7 +11657,13 @@ msg = Escape.escape(((ScriptVariable)theToken).value); break; case Token.symop: - if (msg == null) { + if (statementLength > 3) { + Point3f pt1 = centerParameter(2); + Point3f pt2 = centerParameter(++iToken); + if (!isSyntaxCheck) + msg = viewer.getSymmetryOperation(null, 0, pt1, pt2); + len = ++iToken; + } else { int iop = (checkLength23() == 2 ? 0 : intParameter(2)); if (!isSyntaxCheck) msg = viewer.getSymmetryOperation(null, iop, null, null); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-27 17:21:05
|
Revision: 12713 http://jmol.svn.sourceforge.net/jmol/?rev=12713&view=rev Author: hansonr Date: 2010-03-27 17:20:59 +0000 (Sat, 27 Mar 2010) Log Message: ----------- version=11.9.37_dev # bug fix: load "@x" loads model twice when the saved state is restored # bug fix: load @x preserves load options Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-27 17:05:44 UTC (rev 12712) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-03-27 17:20:59 UTC (rev 12713) @@ -7235,7 +7235,7 @@ if (filename.startsWith("@") && filename.length() > 1) { String s = getStringParameter(filename.substring(1), false); htParams.put("fileData", s); - loadScript = new StringBuffer(filename.substring(1) + " = " + loadScript = new StringBuffer("var " + filename.substring(1) + " = " + Escape.escape(s) + ";\n " + loadScript); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |