git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa48c83
)
JAL-3855 tree title for PAE matrix tree is PAE Matrix (method) for (structure) (sequence)
patch/JAL-3855_fixup_pae
author
James Procter
<j.procter@dundee.ac.uk>
Thu, 20 Jul 2023 07:33:17 +0000
(08:33 +0100)
committer
James Procter
<j.procter@dundee.ac.uk>
Thu, 20 Jul 2023 07:33:56 +0000
(08:33 +0100)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
ab705c2
..
49bd4e9
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-4249,10
+4249,10
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
NewickFile fin = new NewickFile(
new FileParse(cm.getNewick(), DataSourceType.PASTE));
{
NewickFile fin = new NewickFile(
new FileParse(cm.getNewick(), DataSourceType.PASTE));
- String title = cm.getAnnotLabel() + " " + cm.getTreeMethod() + " tree"
- + aa.sequenceRef != null
+ String title = aa.label + " "
+ + cm.getTreeMethod() + " tree" + (aa.sequenceRef != null
? (" for " + aa.sequenceRef.getDisplayId(false))
? (" for " + aa.sequenceRef.getDisplayId(false))
- : "";
+ : "");
showColumnWiseTree(fin, aa, title, w, h, x, y);
} catch (Throwable xx)
showColumnWiseTree(fin, aa, title, w, h, x, y);
} catch (Throwable xx)
@@
-4272,7
+4272,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
return null;
}
{
return null;
}
- TreePanel tp = new TreePanel(alignPanel, nf, aa, title);
+ TreePanel tp = new TreePanel(alignPanel, nf, aa, treeTitle);
tp.setSize(w, h);
tp.setSize(w, h);
@@
-4281,7
+4281,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
tp.setLocation(x, y);
}
tp.setLocation(x, y);
}
- Desktop.addInternalFrame(tp, title, w, h);
+ Desktop.addInternalFrame(tp, treeTitle, w, h);
return tp;
} catch (Throwable xx)
{
return tp;
} catch (Throwable xx)
{