From: Michael T H. <mic...@us...> - 2003-09-30 22:26:30
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers In directory sc8-pr-cvs1:/tmp/cvs-serv15714/src/org/openscience/jmol/viewer/managers Modified Files: LabelManager.java StyleManager.java Log Message: atom numbering starts with 1 ... consistent with RasMol Index: LabelManager.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers/LabelManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LabelManager.java 12 Sep 2003 12:02:08 -0000 1.3 +++ LabelManager.java 30 Sep 2003 22:26:22 -0000 1.4 @@ -91,7 +91,7 @@ label = atomShape.getAtomTypeName(); break; case JmolViewer.NUMBERS: - label = "" + atomIndex; + label = "" + (atomIndex + 1); break; } return label; @@ -120,7 +120,7 @@ ch = strFormat.charAt(ich++); switch (ch) { case 'i': - strExpansion = "" + atomIndex; + strExpansion = "" + (atomIndex + 1); break; case 'a': // FIXME -- mth -- a is not the same as e case 'e': Index: StyleManager.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers/StyleManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- StyleManager.java 30 Sep 2003 22:14:50 -0000 1.4 +++ StyleManager.java 30 Sep 2003 22:26:22 -0000 1.5 @@ -123,7 +123,6 @@ } void setTextColors(Color color) { - viewer.setColorLabel(color); viewer.setColorDistance(color); viewer.setColorAngle(color); viewer.setColorDihedral(color); @@ -135,6 +134,7 @@ viewer.setStyleAtom(JmolViewer.SHADED); viewer.setColorBackground(Color.white); setTextColors(Color.black); + viewer.setColorLabel(Color.black); } public void setRasmolDefaults() { @@ -143,5 +143,6 @@ viewer.setStyleAtom(JmolViewer.NONE); viewer.setColorBackground(Color.black); setTextColors(Color.white); + viewer.setColorLabel(null); } } |