[Jmol-commits] CVS: Jmol/src/org/openscience/jmol ColorManager.java,1.11,1.12 DisplayControl.java,1.68,1.69 Distributor.java,1.3,1.4 PreferencesDialog.java,1.23,1.24

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

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

Modified Files:
	ColorManager.java DisplayControl.java Distributor.java 
	PreferencesDialog.java 
Log Message:
implemented basic script COLOR commands


Index: ColorManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ColorManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ColorManager.java	15 Jan 2003 23:56:34 -0000	1.11
--- ColorManager.java	17 Jan 2003 16:20:48 -0000	1.12
***************
*** 43,57 ****
    }
  
!   private PartialAtomicChargeColors chargeColors =
!     new PartialAtomicChargeColors();
!   private AtomColors atomColors = AtomColors.getInstance();
!   private AtomColorer colorProfile = AtomColors.getInstance();
!   public int modeAtomColorProfile = DisplayControl.ATOMTYPE;
!   public void setModeAtomColorProfile(int mode) {
!     this.modeAtomColorProfile = mode;
!     if (mode == DisplayControl.ATOMTYPE)
!       colorProfile = atomColors;
!     else
!       colorProfile = chargeColors;
    }
  
--- 43,52 ----
    }
  
!   private final AtomColorer[] colorProfiles =
!   { AtomColors.getInstance(),
!     new PartialAtomicChargeColors()};
! 
!   public byte modeAtomColorProfile = DisplayControl.ATOMTYPE;
!   public void setModeAtomColorProfile(byte mode) {
    }
  
***************
*** 75,82 ****
    public Color getColorSelection() {
      if (colorSelectionTransparent == null) {
!       colorSelectionTransparent = 
!         control.getUseGraphics2D() ?
!         getColorTransparent(colorSelection) :
!         colorSelection;
      }
      return colorSelectionTransparent;
--- 70,74 ----
    public Color getColorSelection() {
      if (colorSelectionTransparent == null) {
!       colorSelectionTransparent = getColorTransparent(colorSelection);
      }
      return colorSelectionTransparent;
***************
*** 143,147 ****
  
    public Color getColorAtom(Atom atom) {
!     Color color = colorProfile.getAtomColor(atom);
      if (modeTransparentColors)
        color = getColorTransparent(color);
--- 135,143 ----
  
    public Color getColorAtom(Atom atom) {
!     return getColorAtom(modeAtomColorProfile, atom);
!   }
! 
!   public Color getColorAtom(byte mode, Atom atom) {
!     Color color = colorProfiles[mode].getAtomColor(atom);
      if (modeTransparentColors)
        color = getColorTransparent(color);
***************
*** 178,183 ****
      Color transparent = (Color) htTransparent.get(color);
      if (transparent == null) {
!       int argb = (color.getRGB() & 0x00FFFFFF) | (transparency << 24);
!       transparent = new Color (argb, true);
        htTransparent.put(color, transparent);
      }
--- 174,183 ----
      Color transparent = (Color) htTransparent.get(color);
      if (transparent == null) {
!       if (control.getUseGraphics2D()) {
!         int argb = (color.getRGB() & 0x00FFFFFF) | (transparency << 24);
!         transparent = new Color (argb, true);
!       } else {
!         transparent = color;
!       }
        htTransparent.put(color, transparent);
      }

Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** DisplayControl.java	16 Jan 2003 14:08:44 -0000	1.68
--- DisplayControl.java	17 Jan 2003 16:20:49 -0000	1.69
***************
*** 114,117 ****
--- 114,118 ----
    public final static byte NONE =      4;
  
+   public final static byte COLOR =     -1;
    public final static byte ATOMTYPE =   0;
    public final static byte ATOMCHARGE = 1;
***************
*** 406,412 ****
     ****************************************************************/
  
!   public void setModeAtomColorProfile(int mode) {
      colorManager.setModeAtomColorProfile(mode);
!     distributor.setColorAtom(null, iterAtomMenu());
      refresh();
    }
--- 407,413 ----
     ****************************************************************/
  
!   public void setModeAtomColorProfile(byte mode) {
      colorManager.setModeAtomColorProfile(mode);
!     distributor.setColorAtom(mode, null, iterAtomMenu());
      refresh();
    }
***************
*** 507,510 ****
--- 508,515 ----
    }
  
+   public Color getColorAtom(byte mode, Atom atom) {
+     return colorManager.getColorAtom(mode, atom);
+   }
+ 
    public Color getColorAtomOutline(byte style, Color color) {
      return colorManager.getColorAtomOutline(style, color);
***************
*** 543,546 ****
--- 548,567 ----
    }
  
+   public Color transparentRed() {
+     return getColorTransparent(Color.red);
+   }
+ 
+   public Color transparentGreen() {
+     return getColorTransparent(Color.green);
+   }
+ 
+   public Color transparentBlue() {
+     return getColorTransparent(Color.blue);
+   }
+ 
+   public Color transparentGrey() {
+     return getColorTransparent(Color.gray);
+   }
+ 
    /****************************************************************
     * delegated to SelectionManager
***************
*** 876,879 ****
--- 897,908 ----
    public void setStyleBondScript(byte style) {
      distributor.setStyleBond(style, iterBondScript());
+   }
+ 
+   public void setColorAtomScript(byte mode, Color color) {
+     distributor.setColorAtom(mode, color, iterAtomScript());
+   }
+ 
+   public void setColorBondScript(Color color) {
+     distributor.setColorBond(color, iterBondScript());
    }
  

Index: Distributor.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/Distributor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Distributor.java	16 Jan 2003 14:08:44 -0000	1.3
--- Distributor.java	17 Jan 2003 16:20:51 -0000	1.4
***************
*** 107,116 ****
    }
  
!   public void setColorAtom(Color colorAtom, JmolAtomIterator iter) {
!     boolean useColorProfile = colorAtom == null;
      while (iter.hasNext()) {
        Atom atom = iter.nextAtom();
!       Color color = useColorProfile ? control.getColorAtom(atom) : colorAtom;
!       atom.atomShape.setColorAtom(color);
      }
    }
--- 107,117 ----
    }
  
!   public void setColorAtom(byte mode, Color color, JmolAtomIterator iter) {
!     boolean useColorProfile = color == null;
      while (iter.hasNext()) {
        Atom atom = iter.nextAtom();
!       Color colorT = useColorProfile
!         ? control.getColorAtom(mode, atom) : color;
!       atom.atomShape.setColorAtom(colorT);
      }
    }

Index: PreferencesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/PreferencesDialog.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** PreferencesDialog.java	16 Jan 2003 14:08:44 -0000	1.23
--- PreferencesDialog.java	17 Jan 2003 16:20:52 -0000	1.24
***************
*** 93,97 ****
    private static Color colorVector;
    private static byte styleAtom;
!   private static int AtomColorProfile;
    private static byte styleLabel;
    private static String AtomPropsMode;
--- 93,97 ----
    private static Color colorVector;
    private static byte styleAtom;
!   private static byte modeAtomColorProfile;
    private static byte styleLabel;
    private static String AtomPropsMode;
***************
*** 397,403 ****
  
          JComboBox source = (JComboBox) e.getSource();
!         AtomColorProfile = source.getSelectedIndex();
!         control.setModeAtomColorProfile(AtomColorProfile);
!         props.put("AtomColorProfile", Integer.toString(AtomColorProfile));
        }
      });
--- 397,403 ----
  
          JComboBox source = (JComboBox) e.getSource();
!         modeAtomColorProfile = (byte)source.getSelectedIndex();
!         control.setModeAtomColorProfile(modeAtomColorProfile);
!         props.put("modeAtomColorProfile", ""+modeAtomColorProfile);
        }
      });