[Jmol-commits] CVS: Jmol/src/org/openscience/jmol ColorManager.java,1.18,1.19 DisplayControl.java,1.106,1.107 Distributor.java,1.10,1.11

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

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

Modified Files:
	ColorManager.java DisplayControl.java Distributor.java 
Log Message:
added dots display plus cylinder work

Index: ColorManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ColorManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ColorManager.java	2 Jun 2003 13:35:01 -0000	1.18
+++ ColorManager.java	7 Jul 2003 23:49:20 -0000	1.19
@@ -91,8 +91,13 @@
   }
 
   public Color colorLabel = Color.black;
-  public void setColorLabel (Color c) {
+  public void setColorLabel(Color c) {
     colorLabel = c;
+  }
+
+  public Color colorDots = Color.blue;
+  public void setColorDots(Color c) {
+    colorDots = c;
   }
 
   public Color colorDistance = Color.black;

Index: DisplayControl.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayControl.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- DisplayControl.java	14 Jun 2003 20:21:11 -0000	1.106
+++ DisplayControl.java	7 Jul 2003 23:49:20 -0000	1.107
@@ -482,6 +482,10 @@
     refresh();
   }
 
+  public void setColorDots(Color c) {
+    colorManager.setColorDots(c);
+  }
+
   public Color getColorLabel() {
     return colorManager.colorLabel;
   }
@@ -1176,6 +1180,10 @@
 
   public void setLabelScript(String strLabel) {
     distributor.setLabel(strLabel, iterAtom());
+  }
+
+  public void setMarDots(short marDots) {
+    distributor.setColorMarDots(colorManager.colorDots, marDots, iterAtom());
   }
 
   boolean rasmolHydrogenSetting = true;

Index: Distributor.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/Distributor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Distributor.java	2 Jun 2003 13:35:03 -0000	1.10
+++ Distributor.java	7 Jul 2003 23:49:20 -0000	1.11
@@ -121,4 +121,16 @@
       atom.getAtomShape().setLabel(control.getLabelAtom(strLabel, atom));
     }
   }
+
+  public void setColorMarDots(Color colorDots, short marDots,
+                              JmolAtomIterator iter) {
+    Color colorT = colorDots;
+    while (iter.hasNext()) {
+      Atom atom = iter.nextAtom();
+      if (colorDots == null)
+        colorT = control.getColorAtom(atom);
+      atom.getAtomShape().setColorMarDots(colorT, marDots);
+    }
+  }
+
 }