From: <ha...@us...> - 2010-03-09 17:42:07
|
Revision: 12580 http://jmol.svn.sourceforge.net/jmol/?rev=12580&view=rev Author: hansonr Date: 2010-03-09 17:41:57 +0000 (Tue, 09 Mar 2010) Log Message: ----------- version=11.9.33_dev # bug fix: fx, fy, fz, ux, uy, uz all fail to work Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java 2010-03-08 22:08:00 UTC (rev 12579) +++ trunk/Jmol/src/org/jmol/script/ScriptCompilationTokenParser.java 2010-03-09 17:41:57 UTC (rev 12580) @@ -809,6 +809,7 @@ // in principle be here, for example: // "AND" "SET" "TO*" // these need to have attribute expression to be here + // but then there are FX FY FZ UX UY UZ .. if (!checkResNameSpec) return false; } @@ -818,6 +819,12 @@ return false; specSeen = true; tok = tokPeek(); + if (Token.tokAttr(tok, Token.comparator)) { + returnToken(); + ltokenPostfix.remove(ltokenPostfix.size() - 1); + return false; + } + } boolean wasInteger = false; if (tok == Token.times || tok == Token.integer || tok == Token.seqcode) { Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-03-08 22:08:00 UTC (rev 12579) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-03-09 17:41:57 UTC (rev 12580) @@ -3,6 +3,7 @@ version=11.9.33_dev +# bug fix: fx, fy, fz, ux, uy, uz all fail to work # bug fix: some problems with set picking labels and conflicting mouse actions, no refresh # bug fix: spin $line1 when $line1 is a set of lines in different frames fails # bug fix: spin $line1 followed by spin $line2 causes spin to stop rather than switch axes. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |