[Jmol-commits] SF.net SVN: jmol: [9480] trunk/Jmol/src/org/jmol/viewer/Token.java

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

Revision: 9480
          http://jmol.svn.sourceforge.net/jmol/?rev=9480&view=rev
Author:   hansonr
Date:     2008-06-13 05:08:23 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
version=11.5.40_dev new select() function; H1/H3 fix; quaternion second derivative

# new feature: full math on individual atom properties using 
#  a new function:
#
#   select(x;{atomexpression};booleanEvaluation)
#
#  for example:
#  x = select(x;{*};x.distance({atomno=3}) / 3 > x.distance({atomno=2}))

# bug fix: H1 and H3 in DNA are NOT backbone 
# new feature: quaternion derivative2 (2nd derivative) and quaternion e derivative [experimental]

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Token.java

Modified: trunk/Jmol/src/org/jmol/viewer/Token.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Token.java	2008-06-13 11:48:40 UTC (rev 9479)
+++ trunk/Jmol/src/org/jmol/viewer/Token.java	2008-06-13 12:08:23 UTC (rev 9480)
@@ -108,7 +108,7 @@
   // command types
   
   final static int command           = (1 <<  8);
-  final static int expressionCommand = (1 <<  9); // expression command
+  final static int expressionCommand = (3 <<  8); // expression command
   final static int embeddedExpression= (1 << 10); // embedded expression
   final static int specialstring     = (1 << 11); // echo, label, javascript
   // generally, the minus sign is used to denote atom ranges
@@ -497,7 +497,7 @@
   // xxx(a,b,c)
   
   final static int point        = 1  | 3 << 3 | mathfunc;
-  final static int select       = 2  | 3 << 3 | command | expressionCommand;
+  final static int select       = 2  | 3 << 3 | mathfunc | expressionCommand;
   // xxx(a,b,c,d)
   
   final static int angle        = 1  | 4 << 3 | mathfunc;


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