X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=6f60792b45f11059185b669aef7731caebfb6420;hb=4ef2163fcc47ef807e841fd21949e63c54f8bb11;hp=3a7f05e12ad7c27afbd145b36192e86e1d777888;hpb=6f72987ac17c0846a12b635c29fc1788b3c13b8c;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index 3a7f05e..6f60792 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -173,14 +173,15 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (node.element() instanceof SequenceI) { - if (((SequenceI) ((SequenceNode) node).element()).getColor() == Color.white) + SequenceI seq = (SequenceI)((SequenceNode) node).element(); + + if (av.getSequenceColour(seq) == Color.white) { g.setColor(Color.black); } else { - g.setColor(((SequenceI) ((SequenceNode) node).element()).getColor() - .darker()); + g.setColor(av.getSequenceColour(seq).darker()); } } else @@ -419,7 +420,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (node.element() instanceof SequenceI) { - ((SequenceI) node.element()).setColor(c); + av.setSequenceColour((SequenceI) node.element(), c); } } else @@ -719,7 +720,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (highlightNode != null) { highlightNode = null; - setToolTipText(""); + setToolTipText(null); repaint(); } } @@ -763,6 +764,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, av.setSelectionGroup(null); av.alignment.deleteAllGroups(); + av.sequenceColours=null; colourGroups(); }