git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rightAlignIds
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
3a7f05e
..
6f60792
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-173,14
+173,15
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
if (node.element() instanceof SequenceI)
\r
{
\r
\r
if (node.element() instanceof SequenceI)
\r
{
\r
- if (((SequenceI) ((SequenceNode) node).element()).getColor() == Color.white)
\r
+ SequenceI seq = (SequenceI)((SequenceNode) node).element();
\r
+
\r
+ if (av.getSequenceColour(seq) == Color.white)
\r
{
\r
g.setColor(Color.black);
\r
}
\r
else
\r
{
\r
{
\r
g.setColor(Color.black);
\r
}
\r
else
\r
{
\r
- g.setColor(((SequenceI) ((SequenceNode) node).element()).getColor()
\r
- .darker());
\r
+ g.setColor(av.getSequenceColour(seq).darker());
\r
}
\r
}
\r
else
\r
}
\r
}
\r
else
\r
@@
-419,7
+420,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
if (node.element() instanceof SequenceI)
\r
{
\r
\r
if (node.element() instanceof SequenceI)
\r
{
\r
- ((SequenceI) node.element()).setColor(c);
\r
+ av.setSequenceColour((SequenceI) node.element(), c);
\r
}
\r
}
\r
else
\r
}
\r
}
\r
else
\r
@@
-719,7
+720,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (highlightNode != null)
\r
{
\r
highlightNode = null;
\r
if (highlightNode != null)
\r
{
\r
highlightNode = null;
\r
- setToolTipText("");
\r
+ setToolTipText(null);
\r
repaint();
\r
}
\r
}
\r
repaint();
\r
}
\r
}
\r
@@
-763,6
+764,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
av.setSelectionGroup(null);
\r
av.alignment.deleteAllGroups();
\r
\r
av.setSelectionGroup(null);
\r
av.alignment.deleteAllGroups();
\r
+ av.sequenceColours=null;
\r
\r
colourGroups();
\r
}
\r
\r
colourGroups();
\r
}
\r