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
Fire alignment changed if seqs hidden / revealed
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
7b74078
..
1628f58
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-195,7
+195,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
if (showDistances && (node.dist > 0))
\r
{
\r
\r
if (showDistances && (node.dist > 0))
\r
{
\r
- nodeLabel = new Format("%5.2f").form(node.dist);
\r
+ nodeLabel = new Format("%-.2f").form(node.dist);
\r
}
\r
\r
if (showBootstrap)
\r
}
\r
\r
if (showBootstrap)
\r
@@
-210,7
+210,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
if (!nodeLabel.equals(""))
\r
{
\r
\r
if (!nodeLabel.equals(""))
\r
{
\r
- g.drawString(nodeLabel, xstart, ypos - 10);
\r
+ g.drawString(nodeLabel, xstart+2, ypos - 2);
\r
}
\r
\r
String name = (markPlaceholders && node.isPlaceholder())
\r
}
\r
\r
String name = (markPlaceholders && node.isPlaceholder())
\r
@@
-228,7
+228,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
SequenceGroup selected = av.getSelectionGroup();
\r
\r
if ((selected != null) &&
\r
SequenceGroup selected = av.getSelectionGroup();
\r
\r
if ((selected != null) &&
\r
- selected.sequences.contains((SequenceI) node.element()))
\r
+ selected.getSequences(false).contains((SequenceI) node.element()))
\r
{
\r
g.setColor(Color.gray);
\r
\r
{
\r
g.setColor(Color.gray);
\r
\r
@@
-273,8
+273,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
if (showDistances && (node.dist > 0))
\r
{
\r
\r
if (showDistances && (node.dist > 0))
\r
{
\r
- g.drawString(new Format("%5.2f").form(node.dist), xstart,
\r
- ypos - 5);
\r
+ g.drawString(new Format("%-.2f").form(node.dist).trim(), xstart+2,
\r
+ ypos - 2);
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-751,14
+751,15
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
\r
SequenceGroup sg = new SequenceGroup(sequences,
\r
"TreeGroup", cs, true, true, false, 0,
\r
\r
SequenceGroup sg = new SequenceGroup(sequences,
\r
"TreeGroup", cs, true, true, false, 0,
\r
- av.alignment.getWidth());
\r
+ av.alignment.getWidth()-1);
\r
\r
\r
if ( av.getGlobalColourScheme()!=null
\r
&& av.getGlobalColourScheme().conservationApplied())
\r
{
\r
Conservation c = new Conservation("Group",
\r
\r
\r
if ( av.getGlobalColourScheme()!=null
\r
&& av.getGlobalColourScheme().conservationApplied())
\r
{
\r
Conservation c = new Conservation("Group",
\r
- ResidueProperties.propHash, 3, sg.sequences,
\r
+ ResidueProperties.propHash, 3,
\r
+ sg.getSequences(false),
\r
sg.getStartRes(), sg.getEndRes());
\r
\r
c.calculate();
\r
sg.getStartRes(), sg.getEndRes());
\r
\r
c.calculate();
\r