[Jmol-commits] CVS: Jmol/src/org/openscience/jmol DisplayControl.java,1.75,1.76

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

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

Modified Files:
	DisplayControl.java 
Log Message:
more work with complex atom expressions


Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** DisplayControl.java	19 Jan 2003 18:20:54 -0000	1.75
--- DisplayControl.java	23 Jan 2003 00:07:35 -0000	1.76
***************
*** 30,33 ****
--- 30,34 ----
  import org.openscience.jmol.render.Axes;
  import org.openscience.jmol.render.BoundingBox;
+ import org.openscience.jmol.script.Eval;
  
  import java.awt.Image;
***************
*** 67,70 ****
--- 68,72 ----
    public LabelRenderer labelRenderer;
    public Distributor distributor;
+   public Eval eval;
  
    public String strJvmVersion;
***************
*** 95,98 ****
--- 97,102 ----
      bondRenderer = new BondRenderer(this);
      labelRenderer = new LabelRenderer(this);
+ 
+     eval = new Eval(this);
    }
  
***************
*** 713,716 ****
--- 717,723 ----
      homePosition();
      // don't know if I need this firm refresh here or not
+     // FIXME mth -- we need to clear definitions when we open a new file
+     // but perhaps not if we are in the midst of executing a script?
+     eval.clearDefinitionsAndLoadPredefined();
      refreshFirmly();
    }
***************
*** 935,938 ****
--- 942,949 ----
     * routines for script support
     ****************************************************************/
+ 
+   public Eval getEval() {
+     return eval;
+   }
  
    public void scriptEcho(String str) {