Don't parse input id, leave it as it is
[jalview.git] / src / jalview / appletgui / TreePanel.java
index 51ec4a0..6eeb3d8 100755 (executable)
@@ -22,14 +22,13 @@ package jalview.appletgui;
 import java.util.*;\r
 \r
 import java.awt.event.*;\r
+import java.awt.*;\r
 \r
 import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 import jalview.io.*;\r
-import jalview.jbappletgui.*;\r
 \r
-public class TreePanel\r
-    extends GTreePanel\r
+public class TreePanel extends Frame\r
 {\r
   SequenceI[] seq;\r
   String type;\r
@@ -58,11 +57,17 @@ public class TreePanel
   public TreePanel(AlignViewport av, Vector seqVector, String type,\r
                    String pwtype, int s, int e)\r
   {\r
-    super();\r
-    initTreePanel(av, seqVector, type, pwtype, s, e, null);\r
+    try\r
+    {\r
+      jbInit();\r
+      this.setMenuBar(jMenuBar1);\r
+    }\r
+    catch (Exception ex)\r
+    {\r
+      ex.printStackTrace();\r
+    }\r
 \r
-    // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default\r
-    treeCanvas.setShowDistances(true);\r
+    initTreePanel(av, seqVector, type, pwtype, s, e, null);\r
   }\r
 \r
   /**\r
@@ -77,7 +82,16 @@ public class TreePanel
   public TreePanel(AlignViewport av, Vector seqVector, NewickFile newtree,\r
                    String type, String pwtype)\r
   {\r
-    super();\r
+    try\r
+    {\r
+      jbInit();\r
+      this.setMenuBar(jMenuBar1);\r
+    }\r
+    catch (Exception e)\r
+    {\r
+      e.printStackTrace();\r
+    }\r
+\r
     initTreePanel(av, seqVector, type, pwtype, 0, seqVector.size(), newtree);\r
   }\r
 \r
@@ -100,6 +114,7 @@ public class TreePanel
     treeCanvas = new TreeCanvas(av, scrollPane);\r
     scrollPane.add(treeCanvas);\r
 \r
+\r
     TreeLoader tl = new TreeLoader(newTree);\r
     tl.start();\r
 \r
@@ -116,7 +131,6 @@ public class TreePanel
 \r
     public void run()\r
     {\r
-      NJTree tree;\r
       if(newtree!=null)\r
         tree = new NJTree(seq, newtree);\r
       else\r
@@ -127,6 +141,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 +161,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 +175,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
@@ -198,4 +209,71 @@ public class TreePanel
     treeCanvas.setMarkPlaceholders(placeholdersMenu.getState());\r
   }\r
 \r
+  BorderLayout borderLayout1 = new BorderLayout();\r
+  protected ScrollPane scrollPane = new ScrollPane();\r
+  MenuBar jMenuBar1 = new MenuBar();\r
+  Menu jMenu2 = new Menu();\r
+  protected MenuItem fontSize = new MenuItem();\r
+  protected CheckboxMenuItem bootstrapMenu = new CheckboxMenuItem();\r
+  protected CheckboxMenuItem distanceMenu = new CheckboxMenuItem();\r
+  protected CheckboxMenuItem placeholdersMenu = new CheckboxMenuItem();\r
+  protected CheckboxMenuItem fitToWindow = new CheckboxMenuItem();\r
+  Menu fileMenu = new Menu();\r
+  MenuItem newickOutput = new MenuItem();\r
+\r
+  private void jbInit() throws Exception {\r
+      setLayout(borderLayout1);\r
+      this.setBackground(Color.white);\r
+      this.setFont(new java.awt.Font("Verdana", 0, 12));\r
+      jMenu2.setLabel("View");\r
+      fontSize.setLabel("Font...");\r
+      fontSize.addActionListener(new java.awt.event.ActionListener() {\r
+              public void actionPerformed(ActionEvent e) {\r
+                  fontSize_actionPerformed(e);\r
+              }\r
+          });\r
+      bootstrapMenu.setLabel("Show Bootstrap Values");\r
+      bootstrapMenu.addItemListener(new java.awt.event.ItemListener() {\r
+              public void itemStateChanged(ItemEvent e) {\r
+                  bootstrapMenu_actionPerformed(null);\r
+              }\r
+          });\r
+      distanceMenu.setLabel("Show Distances");\r
+      distanceMenu.addItemListener(new java.awt.event.ItemListener() {\r
+              public void itemStateChanged(ItemEvent e) {\r
+                  distanceMenu_actionPerformed(null);\r
+              }\r
+          });\r
+      placeholdersMenu.setLabel("Mark Unassociated Leaves");\r
+      placeholdersMenu.addItemListener(new java.awt.event.ItemListener() {\r
+              public void itemStateChanged(ItemEvent e) {\r
+                  placeholdersMenu_actionPerformed(null);\r
+              }\r
+          });\r
+      fitToWindow.setState(true);\r
+      fitToWindow.setLabel("Fit To Window");\r
+      fitToWindow.addItemListener(new java.awt.event.ItemListener() {\r
+              public void itemStateChanged(ItemEvent e) {\r
+                  fitToWindow_actionPerformed(null);\r
+              }\r
+          });\r
+      fileMenu.setLabel("File");\r
+      newickOutput.setLabel("Newick Format");\r
+      newickOutput.addActionListener(new ActionListener() {\r
+              public void actionPerformed(ActionEvent actionEvent) {\r
+                  newickOutput_actionPerformed(actionEvent);\r
+              }\r
+          });\r
+\r
+    add(scrollPane, BorderLayout.CENTER);\r
+      jMenuBar1.add(fileMenu);\r
+      jMenuBar1.add(jMenu2);\r
+      jMenu2.add(fitToWindow);\r
+      jMenu2.add(fontSize);\r
+      jMenu2.add(distanceMenu);\r
+      jMenu2.add(bootstrapMenu);\r
+      jMenu2.add(placeholdersMenu);\r
+    fileMenu.add(newickOutput);\r
+  }\r
+\r
 }\r