[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/render Angle.java,1.3,1.4 ArrowLine.java,1.5,1.6 AtomRenderer.java,1.3,1.4 ChemFrameRenderer.java,1.19,1.20 Dihedral.java,1.3,1.4 Distance.java,1.3,1.4 LineShape.java,1.11,1.12

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

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

Modified Files:
	Angle.java ArrowLine.java AtomRenderer.java 
	ChemFrameRenderer.java Dihedral.java Distance.java 
	LineShape.java 
Log Message:
moved functionality out of DisplayControl -- too bloated


Index: Angle.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/Angle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Angle.java	6 Jan 2003 23:34:53 -0000	1.3
--- Angle.java	12 Jan 2003 01:38:02 -0000	1.4
***************
*** 58,62 ****
  
      control.maybeDottedStroke(g);
!     g.setColor(control.colorAngle);
      g.drawLine(xa, ya, xb, yb);
    }
--- 58,62 ----
  
      control.maybeDottedStroke(g);
!     g.setColor(control.getColorAngle());
      g.drawLine(xa, ya, xb, yb);
    }
***************
*** 79,83 ****
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.colorText);
      String s = angleFormat.sprintf(getAngle());
      int j = fontMetrics.stringWidth(s);
--- 79,83 ----
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.getColorText());
      String s = angleFormat.sprintf(getAngle());
      int j = fontMetrics.stringWidth(s);

Index: ArrowLine.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/ArrowLine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ArrowLine.java	6 Jan 2003 23:34:53 -0000	1.5
--- ArrowLine.java	12 Jan 2003 01:38:02 -0000	1.6
***************
*** 78,82 ****
    public void paint(Graphics gc, DisplayControl control) {
  
!     gc.setColor(control.colorVector);
  
      double arrowLengthScale = control.getArrowLengthScale();
--- 78,82 ----
    public void paint(Graphics gc, DisplayControl control) {
  
!     gc.setColor(control.getColorVector());
  
      double arrowLengthScale = control.getArrowLengthScale();

Index: AtomRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/AtomRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AtomRenderer.java	6 Jan 2003 23:34:53 -0000	1.3
--- AtomRenderer.java	12 Jan 2003 01:38:02 -0000	1.4
***************
*** 373,377 ****
      FontMetrics fontMetrics = g.getFontMetrics(font);
      int k = fontMetrics.getAscent();
!     g.setColor(control.colorText);
      
      String label = null;
--- 373,377 ----
      FontMetrics fontMetrics = g.getFontMetrics(font);
      int k = fontMetrics.getAscent();
!     g.setColor(control.getColorText());
      
      String label = null;
***************
*** 406,410 ****
            font = new Font("Helvetica", Font.PLAIN, radius / 2);
            g.setFont(font);
!           g.setColor(control.colorText);
            s = p.stringValue();
            if (s.length() > 5) {
--- 406,410 ----
            font = new Font("Helvetica", Font.PLAIN, radius / 2);
            g.setFont(font);
!           g.setColor(control.getColorText());
            s = p.stringValue();
            if (s.length() > 5) {

Index: ChemFrameRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/ChemFrameRenderer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** ChemFrameRenderer.java	10 Jan 2003 10:50:17 -0000	1.19
--- ChemFrameRenderer.java	12 Jan 2003 01:38:02 -0000	1.20
***************
*** 116,122 ****
      }
                                
      for (int i = 0; i < shapes.length; ++i) {
!       if (control.slabEnabled) {
!         if (shapes[i].z > control.slabValue)
            continue;
        }
--- 116,124 ----
      }
                                
+     boolean slabEnabled = control.getSlabEnabled();
+     int slabValue = control.getSlabValue();
      for (int i = 0; i < shapes.length; ++i) {
!       if (slabEnabled) {
!         if (shapes[i].z > slabValue)
            continue;
        }

Index: Dihedral.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/Dihedral.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Dihedral.java	6 Jan 2003 23:34:53 -0000	1.3
--- Dihedral.java	12 Jan 2003 01:38:02 -0000	1.4
***************
*** 67,71 ****
  
      control.maybeDottedStroke(g);
!     g.setColor(control.colorDihedral);
      g.drawLine(xa, ya, xb, yb);
    }
--- 67,71 ----
  
      control.maybeDottedStroke(g);
!     g.setColor(control.getColorDihedral());
      g.drawLine(xa, ya, xb, yb);
    }
***************
*** 91,95 ****
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.colorText);
      String s = dihedralFormat.sprintf(getDihedral());
      int j = fontMetrics.stringWidth(s);
--- 91,95 ----
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.getColorText());
      String s = dihedralFormat.sprintf(getDihedral());
      int j = fontMetrics.stringWidth(s);

Index: Distance.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/Distance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Distance.java	6 Jan 2003 23:34:54 -0000	1.3
--- Distance.java	12 Jan 2003 01:38:02 -0000	1.4
***************
*** 53,57 ****
                               Atom atom1, Atom atom2) {
      control.maybeDottedStroke(g);
!     g.setColor(control.colorDistance);
      g.drawLine(atom1.getScreenX(), atom1.getScreenY(),
  	       atom2.getScreenX(), atom2.getScreenY());
--- 53,57 ----
                               Atom atom1, Atom atom2) {
      control.maybeDottedStroke(g);
!     g.setColor(control.getColorDistance());
      g.drawLine(atom1.getScreenX(), atom1.getScreenY(),
  	       atom2.getScreenX(), atom2.getScreenY());
***************
*** 75,79 ****
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.colorText);
      String s = distanceFormat.sprintf(getDistance());
      int j = fontMetrics.stringWidth(s);
--- 75,79 ----
      g.setFont(font);
      FontMetrics fontMetrics = g.getFontMetrics(font);
!     g.setColor(control.getColorText());
      String s = distanceFormat.sprintf(getDistance());
      int j = fontMetrics.stringWidth(s);

Index: LineShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/LineShape.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** LineShape.java	6 Jan 2003 23:34:54 -0000	1.11
--- LineShape.java	12 Jan 2003 01:38:03 -0000	1.12
***************
*** 37,41 ****
    
    public void render(Graphics g, Rectangle rectClip, DisplayControl control) {
!     g.setColor(control.colorVector);
      g.drawLine(x, y, xEnd, yEnd);
    }
--- 37,41 ----
    
    public void render(Graphics g, Rectangle rectClip, DisplayControl control) {
!     g.setColor(control.getColorVector());
      g.drawLine(x, y, xEnd, yEnd);
    }