Allow colouring of ids from tree selected groups
authoramwaterhouse <Andrew Waterhouse>
Tue, 2 Nov 2004 16:11:21 +0000 (16:11 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 2 Nov 2004 16:11:21 +0000 (16:11 +0000)
src/jalview/gui/IdCanvas.java

index 03b85e4..fee86cd 100755 (executable)
@@ -166,23 +166,17 @@ public class IdCanvas extends JPanel
           currentColor     = Color.gray;\r
           currentTextColor = Color.black;\r
         }\r
-      } else if (da.getSequenceAt(i).getColor() != null)\r
+      }\r
+      else if (da.getSequenceAt(i).getColor() != null)\r
       {\r
-        currentColor = Color.white;\r
-       /* Color newcol = da.getSequenceAt(i).getColor();\r
-        if (newcol != currentColor) {\r
-          currentColor = newcol;\r
-          if (newcol == Color.black) {\r
-            currentTextColor = Color.white;\r
-          } else {\r
-            currentTextColor = Color.black;\r
-          }\r
-        }*/\r
+        currentColor = da.getSequenceAt(i).getColor();\r
+        currentTextColor = Color.black;\r
       }\r
 \r
       gg.setColor(currentColor);\r
 \r
-      if (currentColor != Color.white) {\r
+      if (currentColor != Color.BLACK)\r
+      {\r
         gg.fillRect(0,\r
                     AlignmentUtil.getPixelHeight(starty,i,charHeight),\r
                     getWidth(),\r