X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=28013510e26555b0352af86ebdddee44012b3ee7;hb=0452450533728e478ef8c893ea2cb3483c740fb3;hp=a9be9bcea0815461ea13b114f64dd19d3063384a;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index a9be9bc..2801351 100755
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -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);
+    PaintRefresher.Register(this, av.getSequenceSetId());
   }
 
-  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)
@@ -136,15 +133,15 @@ public class TreeCanvas
 
       if (node.element() instanceof SequenceI)
       {
-        if ( ( (SequenceI) ( (SequenceNode) node).element()).getColor() ==
-            Color.white)
+        SequenceI seq = (SequenceI) ( (SequenceNode) node).element();
+
+        if (av.getSequenceColour(seq) == Color.white)
         {
           g.setColor(Color.black);
         }
         else
         {
-          g.setColor( ( (SequenceI) ( (SequenceNode) node).element()).getColor().
-                     darker());
+          g.setColor(av.getSequenceColour(seq).darker());
         }
 
       }
@@ -188,7 +185,7 @@ public class TreeCanvas
       // Colour selected leaves differently
       SequenceGroup selected = av.getSelectionGroup();
       if (selected != null &&
-          selected.getSequences(false).contains( (SequenceI) node.element()))
+          selected.getSequences(null).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;
@@ -337,7 +337,7 @@ public class TreeCanvas
 
       if (node.element() instanceof SequenceI)
       {
-        ( (SequenceI) node.element()).setColor(c);
+        av.setSequenceColour((SequenceI) node.element(), c);
       }
     }
     else
@@ -348,36 +348,42 @@ public class TreeCanvas
     }
   }
 
-  public void paint(Graphics g)
+  public void update(Graphics g)
   {
+    paint(g);
+  }
 
+  public void paint(Graphics g)
+  {
     if(tree==null)
       return;
 
-    g.setFont(font);
-
-
-    FontMetrics fm = g.getFontMetrics(font);
-
     if (nameHash.size() == 0)
     {
       repaint();
     }
 
-    if (fitToWindow ||
-        (!fitToWindow &&
-         scrollPane.getSize().height > fm.getHeight() * nameHash.size() + offy))
+    int width = scrollPane.getSize().width;
+    int height = scrollPane.getSize().height;
+    if(!fitToWindow)
     {
-      draw(g, scrollPane.getSize().width, scrollPane.getSize().height);
+      height = g.getFontMetrics(font).getHeight() * nameHash.size();
     }
-    else
+
+    if(getSize().width>width)
     {
-      setSize(new Dimension(scrollPane.getSize().width,
-                            fm.getHeight() * nameHash.size()));
-      draw(g, scrollPane.getSize().width, fm.getHeight() * nameHash.size());
+      setSize(new Dimension(width,height));
+      scrollPane.validate();
+      return;
     }
 
-    scrollPane.validate();
+    setSize(new Dimension(width,height));
+
+
+    g.setFont(font);
+
+    draw(g, width, height);
+
   }
 
 
@@ -431,8 +437,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.getSequenceSetId());
+      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)
@@ -446,19 +501,12 @@ public class TreeCanvas
 
     if (ob instanceof SequenceI)
     {
-      TreeSelectionChanged( (Sequence) ob);
+      treeSelectionChanged( (Sequence) ob);
+      PaintRefresher.Refresh(this, av.getSequenceSetId());
       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,8 +521,21 @@ public class TreeCanvas
 
         av.setSelectionGroup(null);
         av.alignment.deleteAllGroups();
+        av.sequenceColours=null;
+
+        colourGroups();
 
-        for (int i = 0; i < tree.getGroups().size(); i++)
+      }
+    }
+
+    PaintRefresher.Refresh(this, av.getSequenceSetId());
+    repaint();
+
+  }
+
+  void colourGroups()
+  {
+    for (int i = 0; i < tree.getGroups().size(); i++)
         {
 
           Color col = new Color( (int) (Math.random() * 255),
@@ -523,7 +584,7 @@ public class TreeCanvas
             {
             Conservation c = new Conservation("Group",
                                               ResidueProperties.propHash, 3,
-                                              sg.getSequences(false),
+                                              sg.getSequences(null),
                                               sg.getStartRes(),
                                               sg.getEndRes());
 
@@ -538,11 +599,6 @@ public class TreeCanvas
           av.alignment.addGroup(sg);
 
         }
-      }
-    }
-
-    PaintRefresher.Refresh(this, av.alignment);
-    repaint();
 
   }