X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=1c70c240b08b0d2f4a3810594e226dd400429b4d;hb=975c24894c5cd28f756f3ef695bb5c8d6d43d7dc;hp=3ba9cdd5b0b51cc13b56964877acfb37ef88658a;hpb=fdc1773f639bbb70b609965c599d070802933b21;p=jalview.git

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 3ba9cdd..1c70c24 100755
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -18,350 +18,413 @@
  */
 package jalview.gui;
 
-import java.io.*;
-import java.util.*;
-import javax.imageio.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import javax.swing.*;
-
-import org.jibble.epsgraphics.*;
 import jalview.analysis.*;
+
 import jalview.datamodel.*;
+
 import jalview.io.*;
+
 import jalview.jbgui.*;
 
-public class TreePanel
-    extends GTreePanel
-{
-  SequenceI[] seq;
-  String type;
-  String pwtype;
-  int start;
-  int end;
-  TreeCanvas treeCanvas;
-  NJTree tree;
 
-  public TreePanel(AlignViewport av, Vector seqVector, String type,
-                   String pwtype, int s, int e)
-  {
-    super();
+import java.awt.*;
+import java.awt.event.*;
 
-    this.type = type;
-    this.pwtype = pwtype;
+import java.io.*;
+
+import java.util.*;
 
-    start = s;
-    end = e;
+import java.beans.PropertyChangeEvent;
 
-    String longestName = "";
-    seq = new Sequence[seqVector.size()];
 
-    for (int i = 0; i < seqVector.size(); i++)
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class TreePanel extends GTreePanel
+{
+    SequenceI[] seq;
+    String type;
+    String pwtype;
+    int start;
+    int end;
+    TreeCanvas treeCanvas;
+    NJTree tree;
+
+    /**
+     * 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, Vector seqVector, String type,
+                     String pwtype, int s, int e)
     {
-      seq[i] = (Sequence) seqVector.elementAt(i);
+      super();
+      initTreePanel(av, seqVector, type, pwtype, s, e, null);
 
-      if (seq[i].getName().length() > longestName.length())
-      {
-        longestName = seq[i].getName();
-      }
+      // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default
+      showDistances(true);
     }
 
-    tree = new NJTree(seq, type, pwtype, start, end);
+    /**
+     * 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, Vector seqVector, NewickFile newtree,
+                     String type, String pwtype)
+    {
+      super();
+      initTreePanel(av, seqVector, type, pwtype, 0, seqVector.size(), newtree);
+    }
 
-    treeCanvas = new TreeCanvas(av, tree, scrollPane, longestName);
-    treeCanvas.setShowDistances(true); // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default
-    setViewStateFromTreeCanvas(treeCanvas);
-    tree.reCount(tree.getTopNode());
-    tree.findHeight(tree.getTopNode());
-    scrollPane.setViewportView(treeCanvas);
-  }
+    public AlignmentI getAlignment()
+    {
+      return treeCanvas.av.getAlignment();
+    }
 
-  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;
+    void initTreePanel(AlignViewport av, Vector seqVector, String type,
+                       String pwtype, int s, int e, NewickFile newTree)
+    {
 
-    start = 0;
-    end = seqVector.size();
+      this.type = type;
+      this.pwtype = pwtype;
 
-    String longestName = "";
-    seq = new Sequence[seqVector.size()];
+      start = s;
+      end = e;
 
-    for (int i = 0; i < seqVector.size(); i++)
-    {
-      seq[i] = (Sequence) seqVector.elementAt(i);
-    }
+      seq = new Sequence[seqVector.size()];
+      seqVector.toArray(seq);
+
+
+      treeCanvas = new TreeCanvas(av, scrollPane);
+      scrollPane.setViewportView(treeCanvas);
+
+      av.addPropertyChangeListener(new java.beans.PropertyChangeListener()
+      {
+        public void propertyChange(PropertyChangeEvent evt)
+        {
+          if (evt.getPropertyName().equals("alignment"))
+          {
+            if(tree==null)
+              System.out.println("tree is null");
+            if(evt.getNewValue()==null)
+              System.out.println("new value is null");
+
+            tree.UpdatePlaceHolders( (Vector) evt.getNewValue());
+
+            repaint();
+          }
+        }
+      });
 
-    // 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());
-    boolean has_placeholders = false;
+      TreeLoader tl = new TreeLoader(newTree);
+      tl.start();
 
-    for (int i = 0; i < leaves.size(); i++)
+    }
+
+    class TreeLoader extends Thread
     {
-      SequenceNode lf = (SequenceNode) leaves.elementAt(i);
+      NewickFile newtree;
 
-      if (lf.isPlaceholder())
+      public TreeLoader(NewickFile newtree)
       {
-        has_placeholders = true;
+        this.newtree = newtree;
+        if (newtree != null)
+        {
+          // Must be outside run(), as Jalview2XML tries to
+          // update distance/bootstrap visibility at the same time
+          showBootstrap(newtree.HasBootstrap());
+          showDistances(newtree.HasDistances());
+          showPlaceholders(true);
+        }
       }
 
-      if (longestName.length() < ( (Sequence) lf.element()).getName()
-          .length())
+      public void run()
       {
-        longestName = TreeCanvas.PLACEHOLDER +
-            ( (Sequence) lf.element()).getName();
+        if(newtree!=null)
+          tree = new NJTree(seq, newtree);
+        else
+          tree = new NJTree(seq, type, pwtype, start, end);
+
+        tree.reCount(tree.getTopNode());
+        tree.findHeight(tree.getTopNode());
+        treeCanvas.setTree(tree);
+
+        treeCanvas.repaint();
+
+
+        fullid.setState(treeCanvas.av.showDBPrefix);
+        if(!treeCanvas.av.showDBPrefix)
+        {
+          fullid_actionPerformed(null);
+        }
       }
+
     }
 
-    tree.reCount(tree.getTopNode());
-    tree.findHeight(tree.getTopNode());
-
-    treeCanvas = new TreeCanvas(av, tree, scrollPane, longestName);
-    treeCanvas.setShowBootstrap(newtree.HasBootstrap());
-    treeCanvas.setShowDistances(newtree.HasDistances());
-    scrollPane.setViewportView(treeCanvas);
-    treeCanvas.setMarkPlaceholders(has_placeholders);
-    setViewStateFromTreeCanvas(treeCanvas);
-
-    // JBPNote TODO: preference for always marking placeholders in new associated tree
-  }
-
-  public NJTree getTree()
-  {
-    return tree;
-  }
-
-  private void setViewStateFromTreeCanvas(TreeCanvas tree)
-  {
-    // update view menu state from treeCanvas render state
-    distanceMenu.setSelected(tree.showDistances);
-    bootstrapMenu.setSelected(tree.showBootstrap);
-    placeholdersMenu.setSelected(tree.markPlaceholders);
-  }
-
-  private void setTreeCanvasFromViewState(TreeCanvas tree)
-  {
-    // update view menu state from treeCanvas render state
-    tree.showDistances = distanceMenu.isSelected();
-    tree.showBootstrap = bootstrapMenu.isSelected();
-    tree.markPlaceholders = placeholdersMenu.isSelected();
-  }
-
-  public void textbox_actionPerformed(ActionEvent e)
-  {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer();
-
-    StringBuffer buffer = new StringBuffer();
-
-    if (type.equals("AV"))
+    public void showDistances(boolean b)
     {
-      buffer.append("Average distance tree using ");
+      treeCanvas.setShowDistances(b);
+      distanceMenu.setSelected(b);
     }
-    else
+
+    public void showBootstrap(boolean b)
     {
-      buffer.append("Neighbour joining tree using ");
+      treeCanvas.setShowBootstrap(b);
+      bootstrapMenu.setSelected(b);
     }
 
-    if (pwtype.equals("BL"))
+    public void showPlaceholders(boolean b)
     {
-      buffer.append("BLOSUM62");
+      placeholdersMenu.setState(b);
+      treeCanvas.setMarkPlaceholders(b);
     }
-    else
+
+
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public NJTree getTree()
     {
-      buffer.append("PID");
+        return tree;
     }
 
-    Desktop.addInternalFrame(cap, buffer.toString(), 500, 100);
 
-    jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
-    cap.setText(fout.print(false, true));
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void textbox_actionPerformed(ActionEvent e)
+    {
+        CutAndPasteTransfer cap = new CutAndPasteTransfer();
+
+        StringBuffer buffer = new StringBuffer();
 
-  public void saveAsNewick_actionPerformed(ActionEvent e)
-  {
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-        getProperty(
-            "LAST_DIRECTORY"));
-    chooser.setFileView(new JalviewFileView());
-    chooser.setDialogTitle("Save tree as newick file");
-    chooser.setToolTipText("Save");
+        if (type.equals("AV"))
+        {
+            buffer.append("Average distance tree using ");
+        }
+        else
+        {
+            buffer.append("Neighbour joining tree using ");
+        }
 
-    int value = chooser.showSaveDialog(null);
+        if (pwtype.equals("BL"))
+        {
+            buffer.append("BLOSUM62");
+        }
+        else
+        {
+            buffer.append("PID");
+        }
 
-    if (value == JalviewFileChooser.APPROVE_OPTION)
-    {
-      String choice = chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
-                                    chooser.getSelectedFile().getParent());
+        Desktop.addInternalFrame(cap, buffer.toString(), 500, 100);
 
-      try
-      {
         jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
-        String output = fout.print(false, true); // distances only
-        java.io.PrintWriter out = new java.io.PrintWriter(new java.io.
-            FileWriter(
-                choice));
-        out.println(output);
-        out.close();
-      }
-      catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
+        cap.setText(fout.print(false, true));
     }
-  }
-
-  public void printMenu_actionPerformed(ActionEvent e)
-  {
-    //Putting in a thread avoids Swing painting problems
-    treeCanvas.startPrinting();
-  }
-
-  public void fitToWindow_actionPerformed(ActionEvent e)
-  {
-    treeCanvas.fitToWindow = fitToWindow.isSelected();
-    repaint();
-  }
-
-  public void fontSize_actionPerformed(ActionEvent e)
-  {
-    if (treeCanvas == null)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void saveAsNewick_actionPerformed(ActionEvent e)
     {
-      return;
-    }
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty(
+                    "LAST_DIRECTORY"));
+        chooser.setFileView(new JalviewFileView());
+        chooser.setDialogTitle("Save tree as newick file");
+        chooser.setToolTipText("Save");
 
-    String size = fontSize.getText().substring(fontSize.getText().indexOf("-") +
-                                               1);
+        int value = chooser.showSaveDialog(null);
 
-    Object selection = JOptionPane.showInternalInputDialog(Desktop.desktop,
-        "Select font size", "Font size", JOptionPane.QUESTION_MESSAGE,
-        null,
-        new String[]
+        if (value == JalviewFileChooser.APPROVE_OPTION)
         {
-        "1", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20"
-    }, "Font Size - " + size);
+            String choice = chooser.getSelectedFile().getPath();
+            jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+                chooser.getSelectedFile().getParent());
+
+            try
+            {
+                jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
+                String output = fout.print(false, true); // distances only
+                java.io.PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
+                            choice));
+                out.println(output);
+                out.close();
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+    }
 
-    if (selection != null)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void printMenu_actionPerformed(ActionEvent e)
     {
-      fontSize.setText("Font Size - " + selection);
-
-      int i = Integer.parseInt(selection.toString());
-      treeCanvas.setFontSize(i);
+        //Putting in a thread avoids Swing painting problems
+        treeCanvas.startPrinting();
     }
 
-    scrollPane.setViewportView(treeCanvas);
-  }
-
-  public void distanceMenu_actionPerformed(ActionEvent e)
-  {
-    treeCanvas.setShowDistances(distanceMenu.isSelected());
-  }
-
-  public void bootstrapMenu_actionPerformed(ActionEvent e)
-  {
-    treeCanvas.setShowBootstrap(bootstrapMenu.isSelected());
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void fitToWindow_actionPerformed(ActionEvent e)
+    {
+        treeCanvas.fitToWindow = fitToWindow.isSelected();
+        repaint();
+    }
 
-  public void placeholdersMenu_actionPerformed(ActionEvent e)
-  {
-    treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected());
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void font_actionPerformed(ActionEvent e)
+    {
+        if (treeCanvas == null)
+        {
+            return;
+        }
 
-  public void epsTree_actionPerformed(ActionEvent e)
-  {
-    int width = treeCanvas.getWidth();
-    int height = treeCanvas.getHeight();
+        new FontChooser(this);
+    }
 
-    try
+    public Font getTreeFont()
     {
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
-          jalview.bin.Cache.getProperty(
-              "LAST_DIRECTORY"), new String[]
-          {"eps"},
-          new String[]
-          {"Encapsulated Postscript"},
-          "Encapsulated Postscript");
-      chooser.setFileView(new jalview.io.JalviewFileView());
-      chooser.setDialogTitle("Create EPS file from tree");
-      chooser.setToolTipText("Save");
-
-      int value = chooser.showSaveDialog(this);
-
-      if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
-      {
-        return;
-      }
-
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
-                                    chooser.getSelectedFile().getParent());
+        return treeCanvas.font;
+    }
 
-      FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
-      EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width,
-                                           height);
+    public void setTreeFont(Font font)
+    {
+      if(treeCanvas!=null)
+      treeCanvas.setFont(font);
+    }
 
-      treeCanvas.draw(pg, width, height);
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void distanceMenu_actionPerformed(ActionEvent e)
+    {
+        treeCanvas.setShowDistances(distanceMenu.isSelected());
+    }
 
-      pg.flush();
-      pg.close();
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void bootstrapMenu_actionPerformed(ActionEvent e)
+    {
+        treeCanvas.setShowBootstrap(bootstrapMenu.isSelected());
     }
-    catch (Exception ex)
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void placeholdersMenu_actionPerformed(ActionEvent e)
     {
-      ex.printStackTrace();
+        treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected());
     }
-  }
 
-  public void pngTree_actionPerformed(ActionEvent e)
-  {
-    int width = treeCanvas.getWidth();
-    int height = treeCanvas.getHeight();
 
-    try
+    public void fullid_actionPerformed(ActionEvent e)
     {
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
-          jalview.bin.Cache.getProperty(
-              "LAST_DIRECTORY"), new String[]
-          {"png"},
-          new String[]
-          {"Portable network graphics"},
-          "Portable network graphics");
-
-      chooser.setFileView(new jalview.io.JalviewFileView());
-      chooser.setDialogTitle("Create PNG image from tree");
-      chooser.setToolTipText("Save");
+      tree.findHeight(tree.getTopNode());
 
-      int value = chooser.showSaveDialog(this);
+      // Now have to calculate longest name based on the leaves
+      Vector leaves = tree.findLeaves(tree.getTopNode(), new Vector());
 
-      if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
+      treeCanvas.longestName="";
+      for (int i = 0; i < leaves.size(); i++)
       {
-        return;
+        SequenceNode lf = (SequenceNode) leaves.elementAt(i);
+        Sequence seq = (Sequence) lf.element();
+        lf.setName(seq.getDisplayId(fullid.getState(), false));
+        if(lf.getName().length() > treeCanvas.longestName.length())
+          treeCanvas.longestName = lf.getName();
       }
 
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
-                                    chooser.getSelectedFile().getParent());
-
-      FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
+      treeCanvas.repaint();
+    }
 
-      BufferedImage bi = new BufferedImage(width, height,
-                                           BufferedImage.TYPE_INT_RGB);
-      Graphics png = bi.getGraphics();
 
-      treeCanvas.draw(png, width, height);
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void epsTree_actionPerformed(ActionEvent e)
+    {
+      makeTreeImage(jalview.util.ImageMaker.EPS);
+    }
 
-      ImageIO.write(bi, "png", out);
-      out.close();
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void pngTree_actionPerformed(ActionEvent e)
+    {
+       makeTreeImage(jalview.util.ImageMaker.PNG);
     }
-    catch (Exception ex)
+
+    void makeTreeImage(int type)
     {
-      ex.printStackTrace();
+      int width = treeCanvas.getWidth();
+      int height = treeCanvas.getHeight();
+
+      jalview.util.ImageMaker im;
+
+      if(type == jalview.util.ImageMaker.PNG)
+        im = new jalview.util.ImageMaker(this,
+                                         jalview.util.ImageMaker.PNG,
+                                         "Make PNG image from tree",
+                                         width, height,
+                                         null, null);
+        else
+          im = new jalview.util.ImageMaker(this,
+                                 jalview.util.ImageMaker.EPS,
+                                 "Make EPS file from tree",
+                                 width, height,
+                                 null, this.getTitle());
+
+      if(im.getGraphics()!=null)
+      {
+        treeCanvas.draw(im.getGraphics(), width, height);
+        im.writeImage();
+      }
     }
-  }
+
 }