[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app Jmol.java,1.2,1.3 Measure.java,1.1,1.2 MeasurementList.java,1.2,1.3

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

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

Modified Files:
	Jmol.java Measure.java MeasurementList.java 
Log Message:
completed separation of measures from UI


Index: Jmol.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Jmol.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Jmol.java	5 Feb 2003 11:33:08 -0000	1.2
--- Jmol.java	5 Feb 2003 15:58:18 -0000	1.3
***************
*** 276,280 ****
      meas.setMeasurementList(mlist);
      display.setMeasure(meas);
!     control.setMeasureMouse(meas);
      //    mlist.addMeasurementListListener(display);
      port.add(display);
--- 276,280 ----
      meas.setMeasurementList(mlist);
      display.setMeasure(meas);
!     control.setMeasureWatcher(meas);
      //    mlist.addMeasurementListListener(display);
      port.add(display);

Index: Measure.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/Measure.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Measure.java	4 Feb 2003 22:05:45 -0000	1.1
--- Measure.java	5 Feb 2003 15:58:19 -0000	1.2
***************
*** 26,35 ****
  
  import org.openscience.jmol.Atom;
- import org.openscience.jmol.ChemFile;
  import org.openscience.jmol.ChemFrame;
  import org.openscience.jmol.DisplayControl;
! import org.openscience.jmol.render.Angle;
! import org.openscience.jmol.render.Distance;
! import org.openscience.jmol.render.Dihedral;
  
  import java.io.File;
--- 26,32 ----
  
  import org.openscience.jmol.Atom;
  import org.openscience.jmol.ChemFrame;
  import org.openscience.jmol.DisplayControl;
! import org.openscience.jmol.MeasureWatcher;
  
  import java.io.File;
***************
*** 71,75 ****
   *  @author  J. Daniel Gezelter
   */
! public class Measure extends JDialog {
  
    private final static int ADD = 1;
--- 68,72 ----
   *  @author  J. Daniel Gezelter
   */
! public class Measure extends JDialog implements MeasureWatcher {
  
    private final static int ADD = 1;
***************
*** 85,89 ****
      -1, -1, -1, -1
    };
-   private ChemFile cf;
  
    private DisplayControl control;
--- 82,85 ----

Index: MeasurementList.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/MeasurementList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MeasurementList.java	5 Feb 2003 11:33:09 -0000	1.2
--- MeasurementList.java	5 Feb 2003 15:58:19 -0000	1.3
***************
*** 222,257 ****
  
    public void addDistance(int atom1, int atom2) {
!     addDistance(new Distance(atom1, atom2));
!   }
! 
!   public void addDistance(Distance d) {
!     distanceList.addElement(d);
      distances.update();
      treeModel.reload(distances);
-     notifyControl();
    }
  
    public void addAngle(int atom1, int atom2, int atom3) {
!     addAngle(new Angle(atom1, atom2, atom3));
!   }
! 
!   public void addAngle(Angle a) {
! 
!     angleList.addElement(a);
      angles.update();
      treeModel.reload(angles);
-     notifyControl();
    }
  
    public void addDihedral(int atom1, int atom2, int atom3, int atom4) {
!     addDihedral(new Dihedral(atom1, atom2, atom3, atom4));
!   }
! 
!   public void addDihedral(Dihedral d) {
!     dihedralList.addElement(d);
      dihedrals.update();
      treeModel.reload(dihedrals);
-     notifyControl();
    }
  
    public void clear() {
--- 222,242 ----
  
    public void addDistance(int atom1, int atom2) {
!     control.defineMeasure(atom1, atom2);
      distances.update();
      treeModel.reload(distances);
    }
  
    public void addAngle(int atom1, int atom2, int atom3) {
!     control.defineMeasure(atom1, atom2, atom3);
      angles.update();
      treeModel.reload(angles);
    }
  
    public void addDihedral(int atom1, int atom2, int atom3, int atom4) {
!     control.defineMeasure(atom1, atom2, atom3, atom4);
      dihedrals.update();
      treeModel.reload(dihedrals);
    }
+ 
  
    public void clear() {