[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/datamodel Cartoon.java,1.2,1.3 Trace.java,1.12,1.13

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

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

Modified Files:
	Cartoon.java Trace.java 
Log Message:
fixed color bug for cartoon and trace


Index: Cartoon.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Cartoon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cartoon.java	8 Nov 2003 17:49:41 -0000	1.2
+++ Cartoon.java	14 Nov 2003 09:08:26 -0000	1.3
@@ -85,7 +85,7 @@
         int atomIndex = mainchain[j].getAlphaCarbonIndex();
         if (bsSelected.get(atomIndex))
           colixes[j] =
-            (colix == 0
+            (palette != JmolConstants.PALETTE_CPK
              ? viewer.getColixAtomPalette(frame.getAtomAt(atomIndex), palette)
              : colix);
       }

Index: Trace.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Trace.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Trace.java	8 Nov 2003 17:49:41 -0000	1.12
+++ Trace.java	14 Nov 2003 09:08:26 -0000	1.13
@@ -85,7 +85,7 @@
         int atomIndex = mainchain[j].getAlphaCarbonIndex();
         if (bsSelected.get(atomIndex))
           colixes[j] =
-            (colix == 0
+            (palette != JmolConstants.PALETTE_CPK
              ? viewer.getColixAtomPalette(frame.getAtomAt(atomIndex), palette)
              : colix);
       }