Display full id in trees

[jalview.git] / src / jalview / gui / TreePanel.java

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 04be0fd..7677cf8 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -153,6 +153,7 @@ public class TreePanel extends GTreePanel
           // update distance/bootstrap visibility at the same time\r
           showBootstrap(newtree.HasBootstrap());\r
           showDistances(newtree.HasDistances());\r
+          showPlaceholders(true);\r
         }\r
       }\r
 \r
@@ -169,7 +170,14 @@ public class TreePanel extends GTreePanel
 \r
         treeCanvas.repaint();\r
 \r
+\r
+        fullid.setState(treeCanvas.av.showDBPrefix);\r
+        if(!treeCanvas.av.showDBPrefix)\r
+        {\r
+          fullid_actionPerformed(null);\r
+        }\r
       }\r
+\r
     }\r
 \r
     public void showDistances(boolean b)\r
@@ -354,6 +362,28 @@ public class TreePanel extends GTreePanel
         treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected());\r
     }\r
 \r
+\r
+    public void fullid_actionPerformed(ActionEvent e)\r
+    {\r
+      tree.findHeight(tree.getTopNode());\r
+\r
+      // Now have to calculate longest name based on the leaves\r
+      Vector leaves = tree.findLeaves(tree.getTopNode(), new Vector());\r
+\r
+      treeCanvas.longestName="";\r
+      for (int i = 0; i < leaves.size(); i++)\r
+      {\r
+        SequenceNode lf = (SequenceNode) leaves.elementAt(i);\r
+        Sequence seq = (Sequence) lf.element();\r
+        lf.setName(seq.getDisplayId(fullid.getState(), false));\r
+        if(lf.getName().length() > treeCanvas.longestName.length())\r
+          treeCanvas.longestName = lf.getName();\r
+      }\r
+\r
+      treeCanvas.repaint();\r
+    }\r
+\r
+\r
     /**\r
      * DOCUMENT ME!\r
      *\r