[Jmol-commits] CVS: Jmol/src/org/openscience/jmol DisplayControl.java,1.98.2.3,1.98.2.4 ModelManager.java,1.17.2.1,1.17.2.2

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

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

Modified Files:
      Tag: b6
	DisplayControl.java ModelManager.java 
Log Message:
Added animate play/revplay/next/prev/frame n command to scripting language


Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.98.2.3
retrieving revision 1.98.2.4
diff -u -r1.98.2.3 -r1.98.2.4
--- DisplayControl.java	7 May 2003 16:53:23 -0000	1.98.2.3
+++ DisplayControl.java	14 May 2003 17:27:55 -0000	1.98.2.4
@@ -801,6 +801,10 @@
 
   // FIXME mth -- consolidate these two calls to setFrame
 
+  public int getNumberOfFrames() {
+    return modelManager.getNumberOfFrames();
+  }
+
   public void setFrame(int fr) {
     modelManager.setFrame(fr);
     selectAll();
@@ -817,6 +821,10 @@
     clearMeasurements();
     structuralChange = true;
     refresh();
+  }
+
+  public int getCurrentFrameNumber() {
+    return modelManager.getCurrentFrameNumber();
   }
 
   public int numberOfAtoms() {

Index: ModelManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ModelManager.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -r1.17.2.1 -r1.17.2.2
--- ModelManager.java	26 Apr 2003 20:41:14 -0000	1.17.2.1
+++ ModelManager.java	14 May 2003 17:27:55 -0000	1.17.2.2
@@ -46,6 +46,7 @@
   public ChemFile chemfile;
   public ChemFrame chemframe;
   public int nframes = 0;
+  public int currentFrameNumber;
   public PropertyChangeSupport pcs = new PropertyChangeSupport(this);
 
   public void setChemFile(ChemFile chemfile) {
@@ -94,9 +95,18 @@
   }
   
 
+  public int getNumberOfFrames() {
+    return nframes;
+  }
+
+  public int getCurrentFrameNumber() {
+    return currentFrameNumber;
+  }
+
   public void setFrame(int fr) {
     if (haveFile && fr >= 0 && fr < nframes) {
-        setFrame(chemfile.getFrame(fr));
+      currentFrameNumber = fr;
+      setFrame(chemfile.getFrame(fr));
     }
   }