From: <ni...@us...> - 2007-01-09 18:52:33
|
Revision: 6609 http://svn.sourceforge.net/jmol/?rev=6609&view=rev Author: nicove Date: 2007-01-09 10:52:31 -0800 (Tue, 09 Jan 2007) Log Message: ----------- Frame last Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/RepaintManager.java trunk/Jmol/src/org/jmol/viewer/Token.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-01-08 20:16:09 UTC (rev 6608) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-01-09 18:52:31 UTC (rev 6609) @@ -4401,6 +4401,7 @@ case Token.next: case Token.prev: case Token.rewind: + case Token.last: return; } else @@ -4423,6 +4424,9 @@ case Token.rewind: viewer.rewindAnimation(); return; + case Token.last: + viewer.setAnimationLast(); + return; } evalError(GT._("invalid {0} control keyword", "frame") + ": " + token.toString()); Modified: trunk/Jmol/src/org/jmol/viewer/RepaintManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/RepaintManager.java 2007-01-08 20:16:09 UTC (rev 6608) +++ trunk/Jmol/src/org/jmol/viewer/RepaintManager.java 2007-01-09 18:52:31 UTC (rev 6609) @@ -332,6 +332,10 @@ return setAnimationRelative(animationDirection); } + void setAnimationLast() { + setCurrentModelIndex(animationDirection > 0 ? lastModelIndex : firstModelIndex); + } + void rewindAnimation() { setCurrentModelIndex(animationDirection > 0 ? firstModelIndex : lastModelIndex); currentDirection = 1; Modified: trunk/Jmol/src/org/jmol/viewer/Token.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Token.java 2007-01-08 20:16:09 UTC (rev 6608) +++ trunk/Jmol/src/org/jmol/viewer/Token.java 2007-01-09 18:52:31 UTC (rev 6609) @@ -446,6 +446,7 @@ final static int top = misc | 69; final static int bottom = misc | 70; final static int bitset = misc | 71; + final static int last = misc | 72; final static int amino = predefinedset | 0; @@ -843,6 +844,7 @@ "prev", new Token(prev, "previous"), "previous", null, "rewind", new Token(rewind, "rewind"), + "last", new Token(last, "last"), "playrev", new Token(playrev, "playrev"), "play", new Token(play, "play"), "range", new Token(range, "range"), Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-01-08 20:16:09 UTC (rev 6608) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-01-09 18:52:31 UTC (rev 6609) @@ -2266,6 +2266,12 @@ refresh(0, "Viewer:setAnimationPrevious()"); } + void setAnimationLast() { + //Eval + repaintManager.setAnimationLast(); + refresh(0, "Viewer:setAnimationLast()"); + } + void rewindAnimation() { //Eval repaintManager.rewindAnimation(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |