From: Miguel <mig...@us...> - 2004-07-19 16:08:37
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24761/src/org/openscience/jmol/viewer/script Modified Files: Eval.java Log Message: more work on dots surfaces Index: Eval.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- Eval.java 14 Jul 2004 10:24:34 -0000 1.170 +++ Eval.java 19 Jul 2004 16:08:28 -0000 1.171 @@ -1439,11 +1439,14 @@ case Token.identifier: String str = (String)statement[1].value; if (str.equalsIgnoreCase("dotsConvex")) - viewer.setColorDotsConvex(getColorOrNoneParam(2)); + viewer.setShapeProperty(JmolConstants.SHAPE_DOTS, "colorConvex", + getColorOrNoneParam(2)); else if (str.equalsIgnoreCase("dotsConcave")) - viewer.setColorDotsConcave(getColorOrNoneParam(2)); + viewer.setShapeProperty(JmolConstants.SHAPE_DOTS, "colorConcave", + getColorOrNoneParam(2)); else if (str.equalsIgnoreCase("dotsSaddle")) - viewer.setColorDotsSaddle(getColorOrNoneParam(2)); + viewer.setShapeProperty(JmolConstants.SHAPE_DOTS, "colorSaddle", + getColorOrNoneParam(2)); else invalidArgument(); break; @@ -1453,6 +1456,7 @@ } void colorObject(int tokObject, int itoken) throws ScriptException { + System.out.println(" colorObject"); // I do not like this 'palette' scheme // I need to change it so that you can pass either a java.awt.Color // or an object that uniquely identifies the various palettes @@ -1463,6 +1467,7 @@ badArgumentCount(); switch (statement[itoken].tok) { case Token.none: + System.out.println(" color none"); case Token.cpk: break; case Token.formalCharge: |