X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreePanel.java;h=103c96ba54cce439e0912ce20d2f0b3b86be0e6e;hb=4756b29312ca78d0975248c65e50157399e6ce39;hp=c33975b28f60003f6a3ec461c3e8f4e3e2e3327e;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index c33975b..103c96b 100755
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -1,177 +1,314 @@
 /*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 
 package jalview.appletgui;
 
-import jalview.datamodel.*;
-import jalview.io.NewickFile;
-import jalview.analysis.*;
-import jalview.jbappletgui.GTreePanel;
-import java.awt.event.*;
 import java.util.*;
-import jalview.io.NewickFile;
 
+import java.awt.event.*;
+import java.awt.*;
+
+import jalview.analysis.*;
+import jalview.datamodel.*;
+import jalview.io.*;
 
-public class TreePanel extends GTreePanel
+public class TreePanel extends Frame implements ActionListener, ItemListener
 {
   SequenceI[] seq;
   String type;
   String pwtype;
-  AlignViewport av;
   int start;
   int end;
   TreeCanvas treeCanvas;
   NJTree tree;
+  AlignViewport av;
 
   public NJTree getTree()
   {
     return tree;
   }
 
-  public TreePanel(AlignViewport av, Vector seqVector, String type, String pwtype, int s, int e)
+  /**
+   * Creates a new TreePanel object.
+   *
+   * @param av DOCUMENT ME!
+   * @param seqVector DOCUMENT ME!
+   * @param type DOCUMENT ME!
+   * @param pwtype DOCUMENT ME!
+   * @param s DOCUMENT ME!
+   * @param e DOCUMENT ME!
+   */
+  public TreePanel(AlignViewport av, String type, String pwtype)
   {
-    super();
-
-    this.type = type;
-    this.pwtype = pwtype;
+    try
+    {
+      jbInit();
+      this.setMenuBar(jMenuBar1);
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
 
-    start = s;
-    end = e;
+    initTreePanel(av, type, pwtype, null);
+  }
 
-    String longestName = "";
-    seq = new Sequence [seqVector.size()];
-    for (int i=0;i < seqVector.size();i++)
+  /**
+   * Creates a new TreePanel object.
+   *
+   * @param av DOCUMENT ME!
+   * @param seqVector DOCUMENT ME!
+   * @param newtree DOCUMENT ME!
+   * @param type DOCUMENT ME!
+   * @param pwtype DOCUMENT ME!
+   */
+  public TreePanel(AlignViewport av,
+                   String type,
+                   String pwtype,
+                   NewickFile newtree)
+  {
+    try
+    {
+      jbInit();
+      this.setMenuBar(jMenuBar1);
+    }
+    catch (Exception e)
     {
-      seq[i] = (Sequence) seqVector.elementAt(i);
-      if(seq[i].getName().length()>longestName.length())
-        longestName = seq[i].getName();
+      e.printStackTrace();
     }
 
-    tree = new NJTree(seq, type, pwtype, start, end);
+    initTreePanel(av, type, pwtype, newtree);
+  }
+
+
+  void initTreePanel(AlignViewport av,
+                     String type,
+                     String pwtype,
+                     NewickFile newTree)
+  {
 
-    treeCanvas = new TreeCanvas(av, tree, scrollPane, longestName);
+    this.av = av;
+    this.type = type;
+    this.pwtype = pwtype;
 
-    tree.reCount(tree.getTopNode());
-    tree.findHeight(tree.getTopNode());
+    treeCanvas = new TreeCanvas(av, scrollPane);
     scrollPane.add(treeCanvas);
 
+
+    TreeLoader tl = new TreeLoader(newTree);
+    tl.start();
+
   }
-  public TreePanel(AlignViewport av, Vector seqVector, NewickFile newtree,
-                   String type, String pwtype)
-    {
-      super();
-      // These are probably only  arbitrary strings reflecting source of tree
-      this.type = type;
-      this.pwtype = pwtype;
 
-      start = 0;
-      end = seqVector.size();
+  void showOriginalData()
+  {
+    // decide if av alignment is sufficiently different to original data to warrant a new window to be created
+    // create new alignmnt window with hidden regions (unhiding hidden regions yields unaligned seqs)
+    // or create a selection box around columns in alignment view
+    // test Alignment(SeqCigar[])
+    if(tree.seqData!=null)
+    {
+      Object[] alAndColsel = tree.seqData.getAlignmentAndColumnSelection(av.
+          getGapCharacter());
 
-      String longestName = "";
-      seq = new Sequence [seqVector.size()];
-      for (int i=0;i < seqVector.size();i++)
+      if (alAndColsel != null && alAndColsel[0] != null)
       {
-        seq[i] = (Sequence) seqVector.elementAt(i);
+        Alignment al = new Alignment( (SequenceI[]) alAndColsel[0]);
+        AlignFrame af = new AlignFrame(al,
+                                       av.applet,
+                                       "Original Data for Tree",
+                                       false);
+
+        af.viewport.setHiddenColumns( (ColumnSelection) alAndColsel[1]);
       }
-      // This constructor matches sequence names to treenodes and sets up the tree layouts.
-      tree = new NJTree(seq, newtree);
-      // Now have to calculate longest name based on the leaves
-      Vector leaves = tree.findLeaves(tree.getTopNode(),new Vector());
+    }
+    else
+      System.out.println("Original Tree Data not available");
+  }
+
+  class TreeLoader extends Thread
+  {
+    NewickFile newtree;
+    jalview.datamodel.AlignmentView odata=null;
 
-      for (int i=0;i < leaves.size();i++)
-        if (longestName.length()<((Sequence) ((SequenceNode) leaves.elementAt(i)).element()).getName().length())
-          longestName = TreeCanvas.PLACEHOLDER+((Sequence) ((SequenceNode) leaves.elementAt(i)).element()).getName();
+    public TreeLoader(NewickFile newtree)
+    {
+      this.newtree = newtree;
+    }
+
+    public void run()
+    {
+      if(newtree!=null)
+      {
+        if (odata == null)
+          tree = new NJTree(av.alignment.getSequencesArray(),
+                            newtree);
+        else
+          tree = new NJTree(av.alignment.getSequencesArray(), odata, newtree);
+
+        }
+        else
+        {
+          int start, end;
+          SequenceI [] seqs;
+          AlignmentView seqStrings = av.getAlignmentView(av.getSelectionGroup()!=null);
+          if(av.getSelectionGroup()==null)
+          {
+            start = 0;
+            end = av.alignment.getWidth();
+            seqs = av.alignment.getSequencesArray();
+          }
+          else
+          {
+            start = av.getSelectionGroup().getStartRes();
+            end = av.getSelectionGroup().getEndRes()+1;
+            seqs = av.getSelectionGroup().getSequencesInOrder(av.alignment);
+          }
+
+          tree = new NJTree(seqs, seqStrings, type, pwtype, start, end);
+        }
 
       tree.reCount(tree.getTopNode());
       tree.findHeight(tree.getTopNode());
+      treeCanvas.setTree(tree);
+      if(newtree!=null)
+      {
+        distanceMenu.setState(newtree.HasDistances());
+        bootstrapMenu.setState(newtree.HasBootstrap());
+        treeCanvas.setShowBootstrap(newtree.HasBootstrap());
+        treeCanvas.setShowDistances(newtree.HasDistances());
+      }
+
 
-      treeCanvas = new TreeCanvas(av, tree, scrollPane, longestName);
-      treeCanvas.setShowBootstrap(newtree.HasBootstrap());
-      treeCanvas.setShowDistances(newtree.HasDistances());
-      distanceMenu.setState(newtree.HasDistances());
-      bootstrapMenu.setState(newtree.HasBootstrap());
-      if (true) // JBPNote TODO: preference for always marking placeholders in new associated tree
-        placeholdersMenu.setState(treeCanvas.markPlaceholders);
-      scrollPane.add(treeCanvas);
+      treeCanvas.repaint();
+
+      av.setCurrentTree(tree);
 
     }
+  }
 
-public String getText(String format) {
-  return null;
-}
+  public void actionPerformed(ActionEvent evt)
+  {
+    if(evt.getSource()==newickOutput)
+      newickOutput_actionPerformed();
+    else if(evt.getSource()==fontSize)
+      fontSize_actionPerformed();
+    else if(evt.getSource()==inputData)
+      showOriginalData();
+  }
 
-  protected void fitToWindow_actionPerformed(ActionEvent e)
+  public void itemStateChanged(ItemEvent evt)
   {
-    treeCanvas.fitToWindow = fitToWindow.getState();
-    repaint();
+    if(evt.getSource()==fitToWindow)
+      treeCanvas.fitToWindow = fitToWindow.getState();
+
+    else if(evt.getSource()==distanceMenu)
+      treeCanvas.setShowDistances(distanceMenu.getState());
+
+    else if(evt.getSource()==bootstrapMenu)
+      treeCanvas.setShowBootstrap(bootstrapMenu.getState());
+
+    else if(evt.getSource()==placeholdersMenu)
+      treeCanvas.setMarkPlaceholders(placeholdersMenu.getState());
+
+    treeCanvas.repaint();
   }
 
-  public void newickOutput_actionPerformed(ActionEvent actionEvent)
+
+  public void newickOutput_actionPerformed()
   {
     jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
     String output = fout.print(false, true);
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, null);
     cap.setText(output);
     java.awt.Frame frame = new java.awt.Frame();
     frame.add(cap);
-    jalview.bin.JalviewLite.addFrame(frame, type+" "+pwtype, 500,100);
+    jalview.bin.JalviewLite.addFrame(frame, type + " " + pwtype, 500, 100);
   }
 
-
-
-  protected void fontSize_actionPerformed(ActionEvent e)
+  public java.awt.Font getTreeFont()
   {
- /*   if( treeCanvas==null )
-     return;
-
-   String size = fontSize.getLabel().substring( fontSize.getLabel().indexOf("-")+1);
-
-   Object selection = JOptionPane.showInternalInputDialog(Desktop.desktop,
-                               "Select font size",
-                               "Font size",
-                               JOptionPane.QUESTION_MESSAGE,
-                               null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}
-                               ,"Font Size - "+size);
-   if(selection!=null)
-   {
-     fontSize.setText("Font Size - " + selection);
-
-     int i = Integer.parseInt(selection.toString());
-     treeCanvas.setFontSize(i);
-   }
-    scrollPane.setViewportView(treeCanvas);
-*/
+    return treeCanvas.font;
   }
 
-  protected void distanceMenu_actionPerformed(ActionEvent e)
+  public void setTreeFont(java.awt.Font font)
   {
-    treeCanvas.setShowDistances(distanceMenu.getState());
+    treeCanvas.font = font;
+    treeCanvas.repaint();
   }
 
-  protected void bootstrapMenu_actionPerformed(ActionEvent e)
+  protected void fontSize_actionPerformed()
   {
-    treeCanvas.setShowBootstrap(bootstrapMenu.getState());
+     if( treeCanvas==null )
+        return;
+
+    new FontChooser(this);
   }
 
-  protected void placeholdersMenu_actionPerformed(ActionEvent e)
-  {
-      treeCanvas.setMarkPlaceholders(placeholdersMenu.getState());
+
+
+
+  BorderLayout borderLayout1 = new BorderLayout();
+  protected ScrollPane scrollPane = new ScrollPane();
+  MenuBar jMenuBar1 = new MenuBar();
+  Menu jMenu2 = new Menu();
+  protected MenuItem fontSize = new MenuItem();
+  protected CheckboxMenuItem bootstrapMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem distanceMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem placeholdersMenu = new CheckboxMenuItem();
+  protected CheckboxMenuItem fitToWindow = new CheckboxMenuItem();
+  Menu fileMenu = new Menu();
+  MenuItem newickOutput = new MenuItem();
+  MenuItem inputData = new MenuItem();
+
+  private void jbInit() throws Exception {
+      setLayout(borderLayout1);
+      this.setBackground(Color.white);
+      this.setFont(new java.awt.Font("Verdana", 0, 12));
+      jMenu2.setLabel("View");
+      fontSize.setLabel("Font...");
+      fontSize.addActionListener(this);
+      bootstrapMenu.setLabel("Show Bootstrap Values");
+      bootstrapMenu.addItemListener(this);
+      distanceMenu.setLabel("Show Distances");
+      distanceMenu.addItemListener(this);
+      placeholdersMenu.setLabel("Mark Unassociated Leaves");
+      placeholdersMenu.addItemListener(this);
+      fitToWindow.setState(true);
+      fitToWindow.setLabel("Fit To Window");
+      fitToWindow.addItemListener(this);
+      fileMenu.setLabel("File");
+      newickOutput.setLabel("Newick Format");
+      newickOutput.addActionListener(this);
+    inputData.setLabel("Input Data...");
+
+    add(scrollPane, BorderLayout.CENTER);
+      jMenuBar1.add(fileMenu);
+      jMenuBar1.add(jMenu2);
+      jMenu2.add(fitToWindow);
+      jMenu2.add(fontSize);
+      jMenu2.add(distanceMenu);
+      jMenu2.add(bootstrapMenu);
+      jMenu2.add(placeholdersMenu);
+    fileMenu.add(newickOutput);
+    fileMenu.add(inputData);
+    inputData.addActionListener(this);
   }
 
 }