[Jmol-commits] SF.net SVN: jmol:[15394] trunk/Jmol/src/org/jmol

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

Revision: 15394
          http://jmol.svn.sourceforge.net/jmol/?rev=15394&view=rev
Author:   hansonr
Date:     2011-04-22 16:33:50 +0000 (Fri, 22 Apr 2011)

Log Message:
-----------
version=12.1.43

# new feature: set echo ID "xxxx"
# new feature: show drawing  (2D line drawing, from NIH)
# new feature: isosurfaces can be remapped.
#   isosurface molecular map property temperature
#   isosurface map property partialcharge
#   isosurface vdw
#   isosurface map mep

# bug fix: cannot access site_xxx definitions created by PDB file read
# bug fix: echo myecho ... after echo ALL still does ALL
# bug fix: cube file reader (load command) does not convert z coordinates to Angstroms.
# bug fix: isosurface CAVITY cannot be mapped
# bug fix: isosurface CAVITY broken
# bug fix: application load menu unnecessarily creates new frame and loses current script processing

# code: setEcho rewrite

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-04-22 16:32:56 UTC (rev 15393)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java	2011-04-22 16:33:50 UTC (rev 15394)
@@ -3681,11 +3681,13 @@
           val = getStringObjectAsVariable((String) val, null);
         if (val instanceof List<?>) {
           BitSet bs = ScriptVariable.unEscapeBitSetArray((ArrayList<ScriptVariable>)val, true);
-          if (bs != null)
+          if (bs == null)
+            val = value;
+          else
             val = bs;
-        } else if (val instanceof String) {
+        }
+        if (val instanceof String)
           val = lookupIdentifierValue((String) value);
-        }
         rpn.addX(val);
         break;
       }

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-04-22 16:32:56 UTC (rev 15393)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-04-22 16:33:50 UTC (rev 15394)
@@ -3,20 +3,23 @@
 
 version=12.1.43
 
-# bug fix: echo myecho ... after echo ALL still does ALL
-# bug fix: cube file reader (load command) does not convert z coordinates to Angstroms.
+# new feature: set echo ID "xxxx"
+# new feature: show drawing  (2D line drawing, from NIH)
 # new feature: isosurfaces can be remapped.
 #   isosurface molecular map property temperature
 #   isosurface map property partialcharge
 #   isosurface vdw
 #   isosurface map mep
+
+# bug fix: cannot access site_xxx definitions created by PDB file read
+# bug fix: echo myecho ... after echo ALL still does ALL
+# bug fix: cube file reader (load command) does not convert z coordinates to Angstroms.
 # bug fix: isosurface CAVITY cannot be mapped
 # bug fix: isosurface CAVITY broken
-# code: setEcho rewrite
-# new feature: set echo ID "xxxx"
 # bug fix: application load menu unnecessarily creates new frame and loses current script processing
-# new feature: show drawing  (2D line drawing, from NIH)
 
+# code: setEcho rewrite
+
 # --------------------------------------------------------------
 
 #version=12.1.42


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