[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/render AtomShape.java,1.37,1.38 AtomVectorShape.java,1.8,1.9 ChemFrameRenderer.java,1.21,1.22 LineShape.java,1.12,1.13 Shape.java,1.6,1.7 VectorShape.java,1.10,1.11

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

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

Modified Files:
	AtomShape.java AtomVectorShape.java ChemFrameRenderer.java 
	LineShape.java Shape.java VectorShape.java 
Log Message:
removed rectClip from parameters to render in Shape interface


Index: AtomShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/AtomShape.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** AtomShape.java	13 Jan 2003 09:36:08 -0000	1.37
--- AtomShape.java	13 Jan 2003 09:48:23 -0000	1.38
***************
*** 85,101 ****
    }
  
!   public void render(Graphics g, Rectangle clip, DisplayControl control) {
      if (!control.showHydrogens && atom.isHydrogen()) {
        return;
      }
      if (control.showBonds) {
!       renderBonds(g, clip, control);
      }
!     if (control.showAtoms && isClipVisible(clip)) {
        control.atomRenderer.render(this);
      }
    }
  
!   public void renderBonds(Graphics g, Rectangle clip, DisplayControl control) {
      Atom[] bondedAtoms = atom.getBondedAtoms();
      if (bondedAtoms == null) {
--- 85,101 ----
    }
  
!   public void render(Graphics g, DisplayControl control) {
      if (!control.showHydrogens && atom.isHydrogen()) {
        return;
      }
      if (control.showBonds) {
!       renderBonds(g, control);
      }
!     if (control.showAtoms && isClipVisible(control.atomRenderer.clip)) {
        control.atomRenderer.render(this);
      }
    }
  
!   public void renderBonds(Graphics g, DisplayControl control) {
      Atom[] bondedAtoms = atom.getBondedAtoms();
      if (bondedAtoms == null) {
***************
*** 109,113 ****
            ((z > zOther) ||
             (z==zOther && atom.getAtomNumber()>atomOther.getAtomNumber())) &&
!           isBondClipVisible(clip, x, y, atomShapeOther.x, atomShapeOther.y)) {
          control.bondRenderer.render(this, atomShapeOther,
                                      atom.getBondOrder(atomOther));
--- 109,114 ----
            ((z > zOther) ||
             (z==zOther && atom.getAtomNumber()>atomOther.getAtomNumber())) &&
!           isBondClipVisible(control.bondRenderer.clip,
!                             x, y, atomShapeOther.x, atomShapeOther.y)) {
          control.bondRenderer.render(this, atomShapeOther,
                                      atom.getBondOrder(atomOther));

Index: AtomVectorShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/AtomVectorShape.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** AtomVectorShape.java	12 Dec 2002 22:40:11 -0000	1.8
--- AtomVectorShape.java	13 Jan 2003 09:48:23 -0000	1.9
***************
*** 3,7 ****
  import org.openscience.jmol.*;
  import java.awt.Graphics;
- import java.awt.Rectangle;
  import javax.vecmath.Point3d;
  
--- 3,6 ----
***************
*** 25,29 ****
    }
  
!   public void render(Graphics g, Rectangle rectClip, DisplayControl control) {
      // FIXME I think that much/all of this could be moved to instance creation
      double magnitude = atom.getVector().distance(zeroPoint);
--- 24,28 ----
    }
  
!   public void render(Graphics g, DisplayControl control) {
      // FIXME I think that much/all of this could be moved to instance creation
      double magnitude = atom.getVector().distance(zeroPoint);

Index: ChemFrameRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/ChemFrameRenderer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ChemFrameRenderer.java	13 Jan 2003 09:36:08 -0000	1.21
--- ChemFrameRenderer.java	13 Jan 2003 09:48:23 -0000	1.22
***************
*** 43,48 ****
     * @param g the Graphics context to paint to
     */
!   public void paint(Graphics g, Rectangle rectClip,
!                     DisplayControl control) {
      ChemFrame frame = control.getFrame();
      int numAtoms = frame.getNumberOfAtoms();
--- 43,47 ----
     * @param g the Graphics context to paint to
     */
!   public void paint(Graphics g, DisplayControl control) {
      ChemFrame frame = control.getFrame();
      int numAtoms = frame.getNumberOfAtoms();
***************
*** 117,121 ****
            continue;
        }
!       shapes[i].render(g, rectClip, control);
      }
    }
--- 116,120 ----
            continue;
        }
!       shapes[i].render(g, control);
      }
    }

Index: LineShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/LineShape.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** LineShape.java	12 Jan 2003 01:38:03 -0000	1.12
--- LineShape.java	13 Jan 2003 09:48:23 -0000	1.13
***************
*** 36,40 ****
    }
    
!   public void render(Graphics g, Rectangle rectClip, DisplayControl control) {
      g.setColor(control.getColorVector());
      g.drawLine(x, y, xEnd, yEnd);
--- 36,40 ----
    }
    
!   public void render(Graphics g, DisplayControl control) {
      g.setColor(control.getColorVector());
      g.drawLine(x, y, xEnd, yEnd);

Index: Shape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/Shape.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Shape.java	10 Jan 2003 10:50:17 -0000	1.6
--- Shape.java	13 Jan 2003 09:48:23 -0000	1.7
***************
*** 42,47 ****
    // more negative is further back away from the screen
  
!   abstract public void render(Graphics g, Rectangle rectClip,
!                               DisplayControl control);
  
    abstract public void transform(DisplayControl control);
--- 42,46 ----
    // more negative is further back away from the screen
  
!   abstract public void render(Graphics g, DisplayControl control);
  
    abstract public void transform(DisplayControl control);

Index: VectorShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/VectorShape.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** VectorShape.java	12 Dec 2002 22:40:11 -0000	1.10
--- VectorShape.java	13 Jan 2003 09:48:23 -0000	1.11
***************
*** 4,8 ****
  
  import java.awt.Graphics;
- import java.awt.Rectangle;
  import javax.vecmath.Point3d;
  
--- 4,7 ----
***************
*** 23,27 ****
    }
  
!   public void render(Graphics g, Rectangle rectClip, DisplayControl control) {
      double scaling = 1.0;
      ArrowLine al = new ArrowLine(g, control, x, y, xEnd, yEnd,
--- 22,26 ----
    }
  
!   public void render(Graphics g, DisplayControl control) {
      double scaling = 1.0;
      ArrowLine al = new ArrowLine(g, control, x, y, xEnd, yEnd,