X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=928d21fb4ad6183ae34140297738b69be11cca5d;hb=e3a5770d5844eb5cf183424643605611d3545726;hp=76569ddcbef3e0d18946eb065c4eebd903a1b5d6;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 76569dd..928d21f 100755
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 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
@@ -30,7 +30,7 @@ import jalview.schemes.*;
 import jalview.util.*;
 
 public class TreeCanvas
-    extends Panel implements MouseListener
+    extends Panel implements MouseListener, MouseMotionListener
 {
   NJTree tree;
   ScrollPane scrollPane;
@@ -50,25 +50,25 @@ public class TreeCanvas
   String longestName;
   int labelLength = -1;
 
-  //RubberbandRectangle rubberband;
-
-  Vector listeners;
-
   Hashtable nameHash = new Hashtable();
   Hashtable nodeHash = new Hashtable();
 
+  SequenceNode highlightNode;
+
+
   public TreeCanvas(AlignViewport av, ScrollPane scroller)
   {
     this.av = av;
     font = av.getFont();
     scrollPane = scroller;
     addMouseListener(this);
+    addMouseMotionListener(this);
     setLayout(null);
 
     PaintRefresher.Register(this, av.alignment);
   }
 
-  public void TreeSelectionChanged(Sequence sequence)
+  public void treeSelectionChanged(SequenceI sequence)
   {
     SequenceGroup selected = av.getSelectionGroup();
     if (selected == null)
@@ -79,9 +79,6 @@ public class TreeCanvas
 
     selected.setEndRes(av.alignment.getWidth()-1);
     selected.addOrRemove(sequence, true);
-
-    PaintRefresher.Refresh(this, av.alignment);
-    repaint();
   }
 
   public void setTree(NJTree tree)
@@ -188,7 +185,7 @@ public class TreeCanvas
       // Colour selected leaves differently
       SequenceGroup selected = av.getSelectionGroup();
       if (selected != null &&
-          selected.sequences.contains( (SequenceI) node.element()))
+          selected.getSequences(false).contains( (SequenceI) node.element()))
       {
         g.setColor(Color.gray);
 
@@ -214,7 +211,10 @@ public class TreeCanvas
 
       // Draw horizontal line
       g.drawLine(xstart, ypos, xend, ypos);
-      g.fillRect(xend - 2, ypos - 2, 4, 4);
+      if (node == highlightNode)
+        g.fillRect(xend - 3, ypos - 3, 6, 6);
+      else
+        g.fillRect(xend - 2, ypos - 2, 4, 4);
 
       int ystart = (int) ( ( (SequenceNode) node.left()).ycount * chunk) + offy;
       int yend = (int) ( ( (SequenceNode) node.right()).ycount * chunk) + offy;
@@ -295,9 +295,9 @@ public class TreeCanvas
     if (node.left() == null && node.right() == null)
     {
       float height = node.height;
-      float dist = node.dist;
+      //float dist = node.dist;
 
-      int xstart = (int) ( (height - dist) * scale) + offx;
+      //int xstart = (int) ( (height - dist) * scale) + offx;
       int xend = (int) (height * scale) + offx;
 
       int ypos = (int) (node.ycount * chunk) + offy;
@@ -348,21 +348,39 @@ public class TreeCanvas
     }
   }
 
-  public void paint(Graphics g)
+  public void update(Graphics g)
+  {
+    paint(g);
+  }
+
+  Image offscreen;
+  public void paint(Graphics g1)
   {
 
     if(tree==null)
       return;
 
-    g.setFont(font);
-
-    FontMetrics fm = g.getFontMetrics(font);
-
     if (nameHash.size() == 0)
     {
       repaint();
     }
 
+    FontMetrics fm = g1.getFontMetrics(font);
+
+    int width = scrollPane.getSize().width;
+    int height = scrollPane.getSize().height;
+    if(!fitToWindow)
+      height = fm.getHeight() * nameHash.size();
+
+
+    if(offscreen==null || offscreen.getWidth(this)!=width
+    || offscreen.getHeight(this)!=height)
+      offscreen = createImage(width, height);
+
+    Graphics g = offscreen.getGraphics();
+
+    g.setFont(font);
+
     if (fitToWindow ||
         (!fitToWindow &&
          scrollPane.getSize().height > fm.getHeight() * nameHash.size() + offy))
@@ -376,6 +394,7 @@ public class TreeCanvas
       draw(g, scrollPane.getSize().width, fm.getHeight() * nameHash.size());
     }
 
+    g1.drawImage(offscreen, 0, 0, this);
     scrollPane.validate();
   }
 
@@ -430,8 +449,57 @@ public class TreeCanvas
   public void mouseExited(MouseEvent e)
   {}
 
-  public void mouseClicked(MouseEvent e)
+  public void mouseClicked(MouseEvent evt)
   {
+    if (highlightNode != null)
+    {
+      if (evt.getClickCount() > 1)
+      {
+        tree.swapNodes(highlightNode);
+        tree.reCount(tree.getTopNode());
+        tree.findHeight(tree.getTopNode());
+      }
+      else
+      {
+        Vector leaves = new Vector();
+        tree.findLeaves(highlightNode, leaves);
+
+        for (int i = 0; i < leaves.size(); i++)
+        {
+          SequenceI seq =
+              (SequenceI) ( (SequenceNode) leaves.elementAt(i)).element();
+          treeSelectionChanged(seq);
+        }
+      }
+
+      PaintRefresher.Refresh(this, av.alignment);
+      repaint();
+    }
+  }
+
+  public void mouseDragged(MouseEvent ect)
+  {}
+
+
+  public void mouseMoved(MouseEvent evt)
+  {
+    av.setCurrentTree(tree);
+
+    Object ob = findElement(evt.getX(), evt.getY());
+
+    if (ob instanceof SequenceNode)
+    {
+      highlightNode = (SequenceNode) ob;
+      repaint();
+    }
+    else
+    {
+      if (highlightNode != null)
+      {
+        highlightNode = null;
+        repaint();
+      }
+    }
   }
 
   public void mousePressed(MouseEvent e)
@@ -445,19 +513,12 @@ public class TreeCanvas
 
     if (ob instanceof SequenceI)
     {
-      TreeSelectionChanged( (Sequence) ob);
+      treeSelectionChanged( (Sequence) ob);
+      PaintRefresher.Refresh(this, av.alignment);
       repaint();
       return;
-
     }
-    else if (ob instanceof SequenceNode)
-    {
-      SequenceNode tmpnode = (SequenceNode) ob;
-      tree.swapNodes(tmpnode);
-      tree.reCount(tree.getTopNode());
-      tree.findHeight(tree.getTopNode());
-    }
-    else
+    else if ( !(ob instanceof SequenceNode))
     {
       // Find threshold
 
@@ -473,7 +534,19 @@ public class TreeCanvas
         av.setSelectionGroup(null);
         av.alignment.deleteAllGroups();
 
-        for (int i = 0; i < tree.getGroups().size(); i++)
+        colourGroups();
+
+      }
+    }
+
+    PaintRefresher.Refresh(this, av.alignment);
+    repaint();
+
+  }
+
+  void colourGroups()
+  {
+    for (int i = 0; i < tree.getGroups().size(); i++)
         {
 
           Color col = new Color( (int) (Math.random() * 255),
@@ -522,7 +595,8 @@ public class TreeCanvas
             {
             Conservation c = new Conservation("Group",
                                               ResidueProperties.propHash, 3,
-                                              sg.sequences, sg.getStartRes(),
+                                              sg.getSequences(false),
+                                              sg.getStartRes(),
                                               sg.getEndRes());
 
             c.calculate();
@@ -536,11 +610,6 @@ public class TreeCanvas
           av.alignment.addGroup(sg);
 
         }
-      }
-    }
-
-    PaintRefresher.Refresh(this, av.alignment);
-    repaint();
 
   }