[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/script Eval.java,1.60,1.61 Token.java,1.26,1.27

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script
In directory sc8-pr-cvs1:/tmp/cvs-serv9177/src/org/openscience/jmol/viewer/script

Modified Files:
	Eval.java Token.java 
Log Message:
implemented 'spacefill temperature' and 'stick' as a 'wireframe' alias


Index: Eval.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Eval.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Eval.java	24 Dec 2003 20:00:25 -0000	1.60
+++ Eval.java	9 Jan 2004 17:40:15 -0000	1.61
@@ -1531,14 +1531,6 @@
       setHbonds();
       break;
 
-      /*
-    case Token.spacefill:
-      setSpacefill();
-      break;
-    case Token.bond:
-      setBond();
-      break;
-      */
       // not implemented
     case Token.ambient:
     case Token.backfade:
@@ -1629,6 +1621,9 @@
     case Token.wireframe:
       style = JmolConstants.STYLE_WIREFRAME;
       break;
+    case Token.temperature:
+      mar = -1000;
+      break;
     case Token.identifier:
       String id = (String)statement[1].value;
       if (id.equalsIgnoreCase("shaded"))
@@ -2031,95 +2026,6 @@
       unrecognizedSetParameter();
     }
   }
-
-  /*
-  void setWireframerotation() throws ScriptException {
-    viewer.setWireframeRotation(getSetBoolean());
-  }
-
-  void setPerspectivedepth() throws ScriptException {
-    viewer.setPerspectiveDepth(getSetBoolean());
-  }
-
-  void setShowHydrogens() throws ScriptException {
-    viewer.setShowHydrogens(getSetBoolean());
-  }
-
-  void setShowVectors() throws ScriptException {
-    viewer.setShowVectors(getSetBoolean());
-  }
-
-  void setShowMeasurements() throws ScriptException {
-    viewer.setShowMeasurements(getSetBoolean());
-  }
-
-  void setShowSelections() throws ScriptException {
-    viewer.setSelectionHaloEnabled(getSetBoolean());
-  }
-
-  */
-
-  /*
-  void setSpacefill() throws ScriptException {
-    byte style = JmolConstants.STYLE_SHADED;
-    if (statement.length == 3) {
-      switch (statement[2].tok) {
-      case Token.wireframe:
-        style = JmolConstants.STYLE_WIREFRAME;
-        break;
-      case Token.identifier:
-        String str = (String)statement[2].value;
-        if (str.equalsIgnoreCase("shaded"))
-          break;
-        if (str.equals("quickdraw")) {
-          style = JmolViewer.QUICKDRAW;
-          break;
-        }
-        if (str.equals("invisible")) {
-          style = JmolViewer.INVISIBLE;
-          break;
-        }
-        if (str.equals("none")) {
-          style = JmolConstants.STYLE_NONE;
-          break;
-        }
-      default:
-        unrecognizedStyleParameter();
-      }
-    }
-    viewer.setStyleAtomScript(JmolConstants.STYLE_SHADED);
-  }
-
-  void setBond() throws ScriptException {
-    byte style = JmolConstants.STYLE_SHADED;
-    if (statement.length == 3) {
-      switch (statement[2].tok) {
-      case Token.wireframe:
-        style = JmolConstants.STYLE_WIREFRAME;
-        break;
-      case Token.identifier:
-        String str = (String)statement[2].value;
-        if (str.equalsIgnoreCase("shaded"))
-          break;
-        if (str.equals("quickdraw")) {
-          style = JmolViewer.QUICKDRAW;
-          break;
-        }
-        if (str.equals("box")) {
-          style = JmolViewer.BOX;
-          break;
-        }
-        if (str.equals("none")) {
-          style = JmolConstants.STYLE_NONE;
-          break;
-        }
-      default:
-        unrecognizedStyleParameter();
-      }
-    }
-    viewer.setStyleBondScript(JmolConstants.STYLE_SHADED);
-  }
-  */
 
   void setSsbonds() throws ScriptException {
     if (statement.length != 3)

Index: Token.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/script/Token.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Token.java	24 Dec 2003 20:00:26 -0000	1.26
+++ Token.java	9 Jan 2004 17:40:15 -0000	1.27
@@ -368,6 +368,7 @@
     "translate",         new Token(translate,varArgCount, "translate"),
     "unbond",            new Token(unbond,   varArgCount, "unbond"),
     "wireframe",         new Token(wireframe, onDefault1, "wireframe"),
+    "stick",             null,
     "write",             new Token(write,    varArgCount, "write"),
     "zap",               new Token(zap,                0, "zap"),
     "zoom",              new Token(zoom,      onDefault1, "zoom"),