[Jmol-commits] SF.net SVN: jmol:[13531] branches/v11_8/Jmol/src/org/jmol/viewer

[<ha...@us...>]

Revision: 13531
          http://jmol.svn.sourceforge.net/jmol/?rev=13531&view=rev
Author:   hansonr
Date:     2010-07-09 13:57:06 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
11.8.25 VERSION

# bug fix: write("COORDS","PDB") doesn't recognize upper case token COORDS
# bug fix: quaternion frames not properly deleted
# bug fix: rocketBarrels not fully smooth barrels.
# bug fix: isosurface selecting 2nd model while two are displayed produces no surface
# bug fix: draw xx* delete -- does not recognize xx* as wild
# bug fix: dragSelected could be off by 1 pixel

Modified Paths:
--------------
    branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties
    branches/v11_8/Jmol/src/org/jmol/viewer/ScriptEvaluator.java
    branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java

Modified: branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties	2010-07-09 13:54:44 UTC (rev 13530)
+++ branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties	2010-07-09 13:57:06 UTC (rev 13531)
@@ -2,8 +2,9 @@
 # NOTE: Generally only bug fixes should be entered here. 
 # NOTE: New features should be introduced in the trunk version 11.9.x
 
-version=11.8.25_dev
+version=11.8.25
 
+# bug fix: write("COORDS","PDB") doesn't recognize upper case token COORDS
 # bug fix: quaternion frames not properly deleted
 # bug fix: rocketBarrels not fully smooth barrels.
 # bug fix: isosurface selecting 2nd model while two are displayed produces no surface

Modified: branches/v11_8/Jmol/src/org/jmol/viewer/ScriptEvaluator.java
===================================================================
--- branches/v11_8/Jmol/src/org/jmol/viewer/ScriptEvaluator.java	2010-07-09 13:54:44 UTC (rev 13530)
+++ branches/v11_8/Jmol/src/org/jmol/viewer/ScriptEvaluator.java	2010-07-09 13:57:06 UTC (rev 13531)
@@ -4880,7 +4880,7 @@
     if (isSyntaxCheck)
       return;
     String what = (statementLength == 1 ? "" : parameterAsString(1));
-    Token t = Token.getTokenFromName(what);
+    Token t = Token.getTokenFromName(what.toLowerCase());
     if (t != null && (t.tok & Token.command) != 0)
       what = "?command=" + what;
     viewer.getHelp(what);
@@ -10494,7 +10494,7 @@
     BitSet bsFrames = null;
     int quality = Integer.MIN_VALUE;
     if (tok == Token.string) {
-      Token t = Token.getTokenFromName(ScriptVariable.sValue(args[pt]));
+      Token t = Token.getTokenFromName(ScriptVariable.sValue(args[pt]).toLowerCase());
       if (t != null)
         tok = t.tok;
     }

Modified: branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java
===================================================================
--- branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java	2010-07-09 13:54:44 UTC (rev 13530)
+++ branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java	2010-07-09 13:57:06 UTC (rev 13531)
@@ -1652,7 +1652,7 @@
       return addX(viewer.getAtomsWithin(distance, bs, isWithinModelSet));
     if (isSequence)
       return addX(viewer.getSequenceBits(withinStr, bs));
-    return addX(viewer.getAtomBits(Token.getTokenFromName(withinStr).tok, bs));
+    return addX(viewer.getAtomBits(Token.getTokenFromName(withinStr.toLowerCase()).tok, bs));
   }
 
   private boolean evaluateConnected(ScriptVariable[] args) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.