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
allow an existing alignment annotation row to be bound to a sequenceGroup as its...
[jalview.git]
/
src
/
jalview
/
appletgui
/
TreeCanvas.java
diff --git
a/src/jalview/appletgui/TreeCanvas.java
b/src/jalview/appletgui/TreeCanvas.java
index
acfe231
..
a9a4bfe
100755
(executable)
--- a/
src/jalview/appletgui/TreeCanvas.java
+++ b/
src/jalview/appletgui/TreeCanvas.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
@@
-64,9
+64,11
@@
public class TreeCanvas extends Panel implements MouseListener,
SequenceNode highlightNode;
SequenceNode highlightNode;
- public TreeCanvas(AlignViewport av, ScrollPane scroller)
+ AlignmentPanel ap;
+ public TreeCanvas(AlignmentPanel ap, ScrollPane scroller)
{
{
- this.av = av;
+ this.ap = ap;
+ this.av = ap.av;
font = av.getFont();
scrollPane = scroller;
addMouseListener(this);
font = av.getFont();
scrollPane = scroller;
addMouseListener(this);
@@
-184,8
+186,7
@@
public class TreeCanvas extends Panel implements MouseListener,
}
String name = (markPlaceholders && node.isPlaceholder()) ? (PLACEHOLDER + node
}
String name = (markPlaceholders && node.isPlaceholder()) ? (PLACEHOLDER + node
- .getName())
- : node.getName();
+ .getName()) : node.getName();
FontMetrics fm = g.getFontMetrics(font);
int charWidth = fm.stringWidth(name) + 3;
int charHeight = fm.getHeight();
FontMetrics fm = g.getFontMetrics(font);
int charWidth = fm.stringWidth(name) + 3;
int charHeight = fm.getHeight();
@@
-509,6
+510,7
@@
public class TreeCanvas extends Panel implements MouseListener,
PaintRefresher.Refresh(this, av.getSequenceSetId());
repaint();
PaintRefresher.Refresh(this, av.getSequenceSetId());
repaint();
+ av.sendSelection();
}
}
}
}
@@
-551,6
+553,7
@@
public class TreeCanvas extends Panel implements MouseListener,
treeSelectionChanged((Sequence) ob);
PaintRefresher.Refresh(this, av.getSequenceSetId());
repaint();
treeSelectionChanged((Sequence) ob);
PaintRefresher.Refresh(this, av.getSequenceSetId());
repaint();
+ av.sendSelection();
return;
}
else if (!(ob instanceof SequenceNode))
return;
}
else if (!(ob instanceof SequenceNode))
@@
-585,12
+588,12
@@
public class TreeCanvas extends Panel implements MouseListener,
for (int i = 0; i < tree.getGroups().size(); i++)
{
for (int i = 0; i < tree.getGroups().size(); i++)
{
- Color col = new Color((int) (Math.random() * 255), (int) (Math
- .random() * 255), (int) (Math.random() * 255));
+ Color col = new Color((int) (Math.random() * 255),
+ (int) (Math.random() * 255), (int) (Math.random() * 255));
setColor((SequenceNode) tree.getGroups().elementAt(i), col.brighter());
setColor((SequenceNode) tree.getGroups().elementAt(i), col.brighter());
- Vector l = tree.findLeaves((SequenceNode) tree.getGroups().elementAt(
- i), new Vector());
+ Vector l = tree.findLeaves(
+ (SequenceNode) tree.getGroups().elementAt(i), new Vector());
Vector sequences = new Vector();
for (int j = 0; j < l.size(); j++)
Vector sequences = new Vector();
for (int j = 0; j < l.size(); j++)
@@
-609,8
+612,9
@@
public class TreeCanvas extends Panel implements MouseListener,
{
if (av.getGlobalColourScheme() instanceof UserColourScheme)
{
{
if (av.getGlobalColourScheme() instanceof UserColourScheme)
{
- cs = new UserColourScheme(((UserColourScheme) av
- .getGlobalColourScheme()).getColours());
+ cs = new UserColourScheme(
+ ((UserColourScheme) av.getGlobalColourScheme())
+ .getColours());
}
else
}
else
@@
-620,8
+624,8
@@
public class TreeCanvas extends Panel implements MouseListener,
.getGlobalColourScheme()));
}
.getGlobalColourScheme()));
}
- cs.setThreshold(av.getGlobalColourScheme().getThreshold(), av
- .getIgnoreGapsConsensus());
+ cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
+ av.getIgnoreGapsConsensus());
}
SequenceGroup sg = new SequenceGroup(sequences, "", cs, true, true,
}
SequenceGroup sg = new SequenceGroup(sequences, "", cs, true, true,
@@
-633,8
+637,8
@@
public class TreeCanvas extends Panel implements MouseListener,
&& av.getGlobalColourScheme().conservationApplied())
{
Conservation c = new Conservation("Group",
&& av.getGlobalColourScheme().conservationApplied())
{
Conservation c = new Conservation("Group",
- ResidueProperties.propHash, 3, sg.getSequences(null), sg
- .getStartRes(), sg.getEndRes());
+ ResidueProperties.propHash, 3, sg.getSequences(null),
+ sg.getStartRes(), sg.getEndRes());
c.calculate();
c.verdict(false, av.ConsPercGaps);
c.calculate();
c.verdict(false, av.ConsPercGaps);
@@
-647,7
+651,8
@@
public class TreeCanvas extends Panel implements MouseListener,
av.alignment.addGroup(sg);
}
av.alignment.addGroup(sg);
}
-
+ ap.updateAnnotation();
+
}
public void setShowDistances(boolean state)
}
public void setShowDistances(boolean state)