From: Miguel <mig...@us...> - 2004-09-24 19:31:21
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15166/src/org/openscience/jmol/viewer/script Modified Files: Eval.java Token.java Log Message: implemented depth command Index: Eval.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- Eval.java 22 Sep 2004 15:02:52 -0000 1.190 +++ Eval.java 24 Sep 2004 19:31:11 -0000 1.191 @@ -393,6 +393,9 @@ case Token.slab: slab(); break; + case Token.depth: + depth(); + break; case Token.cpk: cpk(); break; @@ -1908,6 +1911,10 @@ } } + void depth() throws ScriptException { + viewer.depthToPercent(intParameter(1)); + } + void cpk() throws ScriptException { short mad = 0; int tok = Token.on; Index: Token.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Token.java,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- Token.java 17 Sep 2004 17:57:18 -0000 1.83 +++ Token.java 24 Sep 2004 19:31:11 -0000 1.84 @@ -149,26 +149,28 @@ final static int write = command | 45 | setparam; final static int zap = command | 46; final static int zoom = command | 47 | showparam | bool; + // openrasmol commands + final static int depth = command | 50; // chime commands - final static int delay = command | 48; - final static int loop = command | 49; - final static int move = command | 50 | negativenums; - final static int view = command | 51; - final static int spin = command | 53 | setparam | showparam | bool; - final static int list = command | 54 | showparam; - final static int display3d = command | 55; - final static int animation = command | 56; - final static int frame = command | 57; + final static int delay = command | 60; + final static int loop = command | 61; + final static int move = command | 62 | negativenums; + final static int view = command | 63; + final static int spin = command | 64 | setparam | showparam | bool; + final static int list = command | 65 | showparam; + final static int display3d = command | 66; + final static int animation = command | 67; + final static int frame = command | 68; // jmol commands - final static int font = command | 58; - final static int hover = command | 59 | specialstring; - final static int vibration = command | 60; - final static int vector = command | 61; - final static int mesh = command | 62; - final static int prueba = command | 63; - final static int rocket = command | 64; - final static int surface = command | predefinedset | 65; - final static int moveto = command | 66 | negativenums; + final static int font = command | 80; + final static int hover = command | 81 | specialstring; + final static int vibration = command | 82; + final static int vector = command | 83; + final static int mesh = command | 84; + final static int prueba = command | 85; + final static int rocket = command | 86; + final static int surface = command | predefinedset | 87; + final static int moveto = command | 88 | negativenums; // parameters final static int ambient = setparam | 0; @@ -411,7 +413,9 @@ "write", new Token(write, varArgCount, "write"), "zap", new Token(zap, 0, "zap"), "zoom", new Token(zoom, onDefault1, "zoom"), - // chime commands + // openrasmol commands + "depth", new Token(depth, 1, "depth"), + // chime commands "delay", new Token(delay, onDefault1, "delay"), "loop", new Token(loop, onDefault1, "loop"), "move", new Token(move, varArgCount, "move"), |