X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=f636257634463dad9d239241173bcdc313a9b0a9;hb=72baa5e02d3f71f1c0259072fdbd0b2bf8250e6c;hp=603a80faf44ce79b5fc59267cf2731d1b99cda03;hpb=0039639a8b6fa7a9bfc131c83a493b5a696f0104;p=jalview.git

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 603a80f..f636257 100755
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -38,7 +38,6 @@ import java.util.*;
 
 import javax.imageio.*;
 
-import javax.swing.*;
 import java.beans.PropertyChangeEvent;
 
 
@@ -50,13 +49,11 @@ import java.beans.PropertyChangeEvent;
  */
 public class TreePanel extends GTreePanel
 {
-    SequenceI[] seq;
     String type;
     String pwtype;
-    int start;
-    int end;
     TreeCanvas treeCanvas;
     NJTree tree;
+    AlignViewport av;
 
     /**
      * Creates a new TreePanel object.
@@ -68,14 +65,13 @@ public class TreePanel extends GTreePanel
      * @param s DOCUMENT ME!
      * @param e DOCUMENT ME!
      */
-    public TreePanel(AlignViewport av, Vector seqVector, String type,
-                     String pwtype, int s, int e)
+    public TreePanel(AlignViewport av, String type, String pwtype)
     {
       super();
-      initTreePanel(av, seqVector, type, pwtype, s, e, null);
+      initTreePanel(av, type, pwtype, null);
 
       // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default
-      treeCanvas.setShowDistances(true);
+      showDistances(true);
     }
 
     /**
@@ -87,28 +83,28 @@ public class TreePanel extends GTreePanel
      * @param type DOCUMENT ME!
      * @param pwtype DOCUMENT ME!
      */
-    public TreePanel(AlignViewport av, Vector seqVector, NewickFile newtree,
-                     String type, String pwtype)
+    public TreePanel(AlignViewport av,
+                     String type,
+                     String pwtype,
+                     NewickFile newtree)
     {
       super();
-      initTreePanel(av, seqVector, type, pwtype, 0, seqVector.size(), newtree);
+      initTreePanel(av, type, pwtype, newtree);
     }
 
+    public AlignmentI getAlignment()
+    {
+      return treeCanvas.av.getAlignment();
+    }
 
-    void initTreePanel(AlignViewport av, Vector seqVector, String type,
-                       String pwtype, int s, int e, NewickFile newTree)
+
+    void initTreePanel(AlignViewport av, String type,  String pwtype,
+                       NewickFile newTree)
     {
 
       this.type = type;
       this.pwtype = pwtype;
 
-      start = s;
-      end = e;
-
-      seq = new Sequence[seqVector.size()];
-      seqVector.toArray(seq);
-
-
       treeCanvas = new TreeCanvas(av, scrollPane);
       scrollPane.setViewportView(treeCanvas);
 
@@ -130,6 +126,8 @@ public class TreePanel extends GTreePanel
         }
       });
 
+      this.av = av;
+
 
       TreeLoader tl = new TreeLoader(newTree);
       tl.start();
@@ -143,68 +141,91 @@ public class TreePanel extends GTreePanel
       public TreeLoader(NewickFile newtree)
       {
         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());
+        }
       }
 
       public void run()
       {
+
         if(newtree!=null)
-          tree = new NJTree(seq, newtree);
+          tree = new NJTree(av.alignment.getSequencesArray(),
+                            newtree);
         else
-          tree = new NJTree(seq, type, pwtype, start, end);
+        {
+          int start, end;
+          SequenceI [] seqs;
+          String [] seqStrings = null;
+          if (av.hasHiddenColumns)
+          {
+            seqStrings = av.getViewAsString(true);
+          }
+
+          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)
-        {
-          treeCanvas.setShowBootstrap(newtree.HasBootstrap());
-          treeCanvas.setShowDistances(newtree.HasDistances());
-        }
-
-        setViewStateFromTreeCanvas(treeCanvas);
 
         treeCanvas.repaint();
 
+        av.setCurrentTree(tree);
+
       }
     }
 
+    public void showDistances(boolean b)
+    {
+      treeCanvas.setShowDistances(b);
+      distanceMenu.setSelected(b);
+    }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public NJTree getTree()
+    public void showBootstrap(boolean b)
     {
-        return tree;
+      treeCanvas.setShowBootstrap(b);
+      bootstrapMenu.setSelected(b);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param tree DOCUMENT ME!
-     */
-    private void setViewStateFromTreeCanvas(TreeCanvas tree)
+    public void showPlaceholders(boolean b)
     {
-        // update view menu state from treeCanvas render state
-        distanceMenu.setSelected(tree.showDistances);
-        bootstrapMenu.setSelected(tree.showBootstrap);
-        placeholdersMenu.setSelected(tree.markPlaceholders);
+      placeholdersMenu.setState(b);
+      treeCanvas.setMarkPlaceholders(b);
     }
 
+
+
+
     /**
      * DOCUMENT ME!
      *
-     * @param tree DOCUMENT ME!
+     * @return DOCUMENT ME!
      */
-    private void setTreeCanvasFromViewState(TreeCanvas tree)
+    public NJTree getTree()
     {
-        // update view menu state from treeCanvas render state
-        tree.showDistances = distanceMenu.isSelected();
-        tree.showBootstrap = bootstrapMenu.isSelected();
-        tree.markPlaceholders = placeholdersMenu.isSelected();
+        return tree;
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -237,7 +258,7 @@ public class TreePanel extends GTreePanel
         Desktop.addInternalFrame(cap, buffer.toString(), 500, 100);
 
         jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
-        cap.setText(fout.print(false, true));
+        cap.setText(fout.print(tree.isHasBootstrap(), tree.isHasDistances(), tree.isHasRootDistance()));
     }
 
     /**
@@ -264,7 +285,7 @@ public class TreePanel extends GTreePanel
             try
             {
                 jalview.io.NewickFile fout = new jalview.io.NewickFile(tree.getTopNode());
-                String output = fout.print(false, true); // distances only
+                String output = fout.print(tree.isHasBootstrap(), tree.isHasDistances(), tree.isHasRootDistance());
                 java.io.PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
                             choice));
                 out.println(output);
@@ -288,6 +309,16 @@ public class TreePanel extends GTreePanel
         treeCanvas.startPrinting();
     }
 
+
+    public void originalSeqData_actionPerformed(ActionEvent e)
+    {
+      CutAndPasteTransfer cap = new CutAndPasteTransfer();
+      cap.setText(tree.printOriginalSequenceData());
+      Desktop.addInternalFrame(cap, "Original Data",
+          400, 400);
+    }
+
+
     /**
      * DOCUMENT ME!
      *
@@ -311,15 +342,15 @@ public class TreePanel extends GTreePanel
             return;
         }
 
-        FontChooser fontchooser = new FontChooser(this);
+        new FontChooser(this);
     }
 
-    public Font getFont()
+    public Font getTreeFont()
     {
-      return treeCanvas.font;
+        return treeCanvas.font;
     }
 
-    public void setFont(Font font)
+    public void setTreeFont(Font font)
     {
       if(treeCanvas!=null)
       treeCanvas.setFont(font);