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
JAL-1031 JAL-1032 if selection is non-null but empty, then calculate PCA or tree...
[jalview.git]
/
src
/
jalview
/
appletgui
/
TreePanel.java
diff --git
a/src/jalview/appletgui/TreePanel.java
b/src/jalview/appletgui/TreePanel.java
index
29e5654
..
ec2512f
100644
(file)
--- a/
src/jalview/appletgui/TreePanel.java
+++ b/
src/jalview/appletgui/TreePanel.java
@@
-186,11
+186,11
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
{
if (odata == null)
{
{
if (odata == null)
{
- tree = new NJTree(av.alignment.getSequencesArray(), newtree);
+ tree = new NJTree(av.getAlignment().getSequencesArray(), newtree);
}
else
{
}
else
{
- tree = new NJTree(av.alignment.getSequencesArray(), odata,
+ tree = new NJTree(av.getAlignment().getSequencesArray(), odata,
newtree);
}
newtree);
}
@@
-199,19
+199,21
@@
public class TreePanel extends EmbmenuFrame implements ActionListener,
{
int start, end;
SequenceI[] seqs;
{
int start, end;
SequenceI[] seqs;
- AlignmentView seqStrings = av.getAlignmentView(av
- .getSelectionGroup() != null);
- if (av.getSelectionGroup() == null)
+ boolean selview=(av
+ .getSelectionGroup() != null) && (av
+ .getSelectionGroup().getSize()>1);
+ AlignmentView seqStrings = av.getAlignmentView(selview);
+ if (!selview)
{
start = 0;
{
start = 0;
- end = av.alignment.getWidth();
- seqs = av.alignment.getSequencesArray();
+ end = av.getAlignment().getWidth();
+ seqs = av.getAlignment().getSequencesArray();
}
else
{
start = av.getSelectionGroup().getStartRes();
end = av.getSelectionGroup().getEndRes() + 1;
}
else
{
start = av.getSelectionGroup().getStartRes();
end = av.getSelectionGroup().getEndRes() + 1;
- seqs = av.getSelectionGroup().getSequencesInOrder(av.alignment);
+ seqs = av.getSelectionGroup().getSequencesInOrder(av.getAlignment());
}
tree = new NJTree(seqs, seqStrings, type, pwtype, start, end);
}
tree = new NJTree(seqs, seqStrings, type, pwtype, start, end);