Wrap alignment with annotations

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

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 42be37b..3e26a4b 100755 (executable)
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -60,9 +60,6 @@ public class TreePanel
   {\r
     super();\r
     initTreePanel(av, seqVector, type, pwtype, s, e, null);\r
-\r
-    // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default\r
-    treeCanvas.setShowDistances(true);\r
   }\r
 \r
   /**\r
@@ -127,6 +124,8 @@ public class TreePanel
       treeCanvas.setTree(tree);\r
       if(newtree!=null)\r
       {\r
+        distanceMenu.setState(newtree.HasDistances());\r
+        bootstrapMenu.setState(newtree.HasBootstrap());\r
         treeCanvas.setShowBootstrap(newtree.HasBootstrap());\r
         treeCanvas.setShowDistances(newtree.HasDistances());\r
       }\r
@@ -145,7 +144,7 @@ public class TreePanel
   protected void fitToWindow_actionPerformed(ActionEvent e)\r
   {\r
     treeCanvas.fitToWindow = fitToWindow.getState();\r
-    repaint();\r
+    treeCanvas.repaint();\r
   }\r
 \r
   public void newickOutput_actionPerformed(ActionEvent actionEvent)\r
@@ -159,28 +158,23 @@ public class TreePanel
     jalview.bin.JalviewLite.addFrame(frame, type + " " + pwtype, 500, 100);\r
   }\r
 \r
-  protected void fontSize_actionPerformed(ActionEvent e)\r
+  public java.awt.Font getTreeFont()\r
   {\r
-    /*   if( treeCanvas==null )\r
-        return;\r
+    return treeCanvas.font;\r
+  }\r
 \r
-      String size = fontSize.getLabel().substring( fontSize.getLabel().indexOf("-")+1);\r
+  public void setTreeFont(java.awt.Font font)\r
+  {\r
+    treeCanvas.font = font;\r
+    treeCanvas.repaint();\r
+  }\r
 \r
-      Object selection = JOptionPane.showInternalInputDialog(Desktop.desktop,\r
-                                  "Select font size",\r
-                                  "Font size",\r
-                                  JOptionPane.QUESTION_MESSAGE,\r
-     null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}\r
-                                  ,"Font Size - "+size);\r
-      if(selection!=null)\r
-      {\r
-        fontSize.setText("Font Size - " + selection);\r
+  protected void fontSize_actionPerformed(ActionEvent e)\r
+  {\r
+     if( treeCanvas==null )\r
+        return;\r
 \r
-        int i = Integer.parseInt(selection.toString());\r
-        treeCanvas.setFontSize(i);\r
-      }\r
-       scrollPane.setViewportView(treeCanvas);\r
-     */\r
+    new FontChooser(this);\r
   }\r
 \r
   protected void distanceMenu_actionPerformed(ActionEvent e)\r