X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=c38b1a5d5a1aa0564c401169e4f8a3a33c5646d2;hb=fd618c7346eab858aa0039376872820aca37783a;hp=1c1e7cff92f332c7b47b68466194ce0e0651f9d2;hpb=2267a3de329c0fb4848c6e1a42ad2d52c658f759;p=jalview.git

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 1c1e7cf..c38b1a5 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) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 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
@@ -55,7 +55,6 @@ public class TreeCanvas
 
   SequenceNode highlightNode;
 
-
   public TreeCanvas(AlignViewport av, ScrollPane scroller)
   {
     this.av = av;
@@ -65,7 +64,7 @@ public class TreeCanvas
     addMouseMotionListener(this);
     setLayout(null);
 
-    PaintRefresher.Register(this, av.alignment);
+    PaintRefresher.Register(this, av.getSequenceSetId());
   }
 
   public void treeSelectionChanged(SequenceI sequence)
@@ -77,7 +76,7 @@ public class TreeCanvas
       av.setSelectionGroup(selected);
     }
 
-    selected.setEndRes(av.alignment.getWidth()-1);
+    selected.setEndRes(av.alignment.getWidth() - 1);
     selected.addOrRemove(sequence, true);
   }
 
@@ -168,7 +167,7 @@ public class TreeCanvas
       }
       if (!nodeLabel.equals(""))
       {
-        g.drawString(nodeLabel, xstart+2, ypos - 2);
+        g.drawString(nodeLabel, xstart + 2, ypos - 2);
       }
 
       String name = (markPlaceholders && node.isPlaceholder()) ?
@@ -185,7 +184,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);
 
@@ -212,9 +211,13 @@ public class TreeCanvas
       // Draw horizontal line
       g.drawLine(xstart, ypos, xend, ypos);
       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;
@@ -227,7 +230,7 @@ public class TreeCanvas
 
       if (showDistances && node.dist > 0)
       {
-        g.drawString(new Format("%-.2f").form(node.dist), xstart+2, ypos - 2);
+        g.drawString(new Format("%-.2f").form(node.dist), xstart + 2, ypos - 2);
       }
 
     }
@@ -337,7 +340,7 @@ public class TreeCanvas
 
       if (node.element() instanceof SequenceI)
       {
-        av.setSequenceColour((SequenceI) node.element(), c);
+        av.setSequenceColour( (SequenceI) node.element(), c);
       }
     }
     else
@@ -353,55 +356,43 @@ public class TreeCanvas
     paint(g);
   }
 
-  Image offscreen;
-  public void paint(Graphics g1)
+  public void paint(Graphics g)
   {
-
-    if(tree==null)
+    if (tree == null)
+    {
       return;
+    }
 
     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 (!fitToWindow)
+    {
+      height = g.getFontMetrics(font).getHeight() * nameHash.size();
+    }
 
-    if(offscreen==null || offscreen.getWidth(this)!=width
-    || offscreen.getHeight(this)!=height)
-      offscreen = createImage(width, height);
+    if (getSize().width > width)
+    {
+      setSize(new Dimension(width, height));
+      scrollPane.validate();
+      return;
+    }
 
-    Graphics g = offscreen.getGraphics();
+    setSize(new Dimension(width, height));
 
     g.setFont(font);
 
-    if (fitToWindow ||
-        (!fitToWindow &&
-         scrollPane.getSize().height > fm.getHeight() * nameHash.size() + offy))
-    {
-      draw(g, scrollPane.getSize().width, scrollPane.getSize().height);
-    }
-    else
-    {
-      setSize(new Dimension(scrollPane.getSize().width,
-                            fm.getHeight() * nameHash.size()));
-      draw(g, scrollPane.getSize().width, fm.getHeight() * nameHash.size());
-    }
+    draw(g, width, height);
 
-    g1.drawImage(offscreen, 0, 0, this);
-    scrollPane.validate();
   }
 
-
   public void draw(Graphics g, int width, int height)
   {
-    offy = font.getSize()+10;
+    offy = font.getSize() + 10;
 
     g.setColor(Color.white);
     g.fillRect(0, 0, width, height);
@@ -472,7 +463,7 @@ public class TreeCanvas
         }
       }
 
-      PaintRefresher.Refresh(this, av.alignment);
+      PaintRefresher.Refresh(this, av.getSequenceSetId());
       repaint();
     }
   }
@@ -480,7 +471,6 @@ public class TreeCanvas
   public void mouseDragged(MouseEvent ect)
   {}
 
-
   public void mouseMoved(MouseEvent evt)
   {
     av.setCurrentTree(tree);
@@ -514,11 +504,11 @@ public class TreeCanvas
     if (ob instanceof SequenceI)
     {
       treeSelectionChanged( (Sequence) ob);
-      PaintRefresher.Refresh(this, av.alignment);
+      PaintRefresher.Refresh(this, av.getSequenceSetId());
       repaint();
       return;
     }
-    else if ( !(ob instanceof SequenceNode))
+    else if (! (ob instanceof SequenceNode))
     {
       // Find threshold
 
@@ -533,14 +523,14 @@ public class TreeCanvas
 
         av.setSelectionGroup(null);
         av.alignment.deleteAllGroups();
-        av.sequenceColours.clear();
+        av.sequenceColours = null;
 
         colourGroups();
 
       }
     }
 
-    PaintRefresher.Refresh(this, av.alignment);
+    PaintRefresher.Refresh(this, av.getSequenceSetId());
     repaint();
 
   }
@@ -548,69 +538,76 @@ public class TreeCanvas
   void colourGroups()
   {
     for (int i = 0; i < tree.getGroups().size(); i++)
-        {
+    {
 
-          Color col = new Color( (int) (Math.random() * 255),
-                                (int) (Math.random() * 255),
-                                (int) (Math.random() * 255));
-          setColor( (SequenceNode) tree.getGroups().elementAt(i), col.brighter());
+      Color col = new Color( (int) (Math.random() * 255),
+                            (int) (Math.random() * 255),
+                            (int) (Math.random() * 255));
+      setColor( (SequenceNode) tree.getGroups().elementAt(i), col.brighter());
 
-          Vector l = tree.findLeaves( (SequenceNode) tree.getGroups().elementAt(
-              i), new Vector());
+      Vector l = tree.findLeaves( (SequenceNode) tree.getGroups().elementAt(
+          i), new Vector());
 
-          Vector sequences = new Vector();
-          for (int j = 0; j < l.size(); j++)
-          {
-            SequenceI s1 = (SequenceI) ( (SequenceNode) l.elementAt(j)).element();
-            if(!sequences.contains(s1))
-              sequences.addElement(s1);
-          }
+      Vector sequences = new Vector();
+      for (int j = 0; j < l.size(); j++)
+      {
+        SequenceI s1 = (SequenceI) ( (SequenceNode) l.elementAt(j)).element();
+        if (!sequences.contains(s1))
+        {
+          sequences.addElement(s1);
+        }
+      }
 
-          ColourSchemeI cs = null;
+      ColourSchemeI cs = null;
 
-          if (av.getGlobalColourScheme() != null)
-          {
-            if (av.getGlobalColourScheme() instanceof UserColourScheme)
-            {
-              cs = new UserColourScheme(
-                  ( (UserColourScheme) av.getGlobalColourScheme()).getColours());
-
-            }
-            else
-              cs = ColourSchemeProperty.getColour(sequences,
-                                                  av.alignment.getWidth(),
-                                                  ColourSchemeProperty.getColourName(
-                                                      av.getGlobalColourScheme()));
-
-              cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
-                                                   av.getIgnoreGapsConsensus());
-          }
+      if (av.getGlobalColourScheme() != null)
+      {
+        if (av.getGlobalColourScheme() instanceof UserColourScheme)
+        {
+          cs = new UserColourScheme(
+              ( (UserColourScheme) av.getGlobalColourScheme()).getColours());
 
-          SequenceGroup sg = new SequenceGroup(sequences, "TreeGroup",
-                                               cs, true, true,
-                                               false, 0, av.alignment.getWidth()-1);
+        }
+        else
+        {
+          cs = ColourSchemeProperty.getColour(sequences,
+                                              av.alignment.getWidth(),
+                                              ColourSchemeProperty.
+                                              getColourName(
+                                                  av.getGlobalColourScheme()));
+        }
 
+        cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
+                        av.getIgnoreGapsConsensus());
+      }
 
-          if (  av.getGlobalColourScheme()!=null
-             && av.getGlobalColourScheme().conservationApplied())
-            {
-            Conservation c = new Conservation("Group",
-                                              ResidueProperties.propHash, 3,
-                                              sg.getSequences(false),
-                                              sg.getStartRes(),
-                                              sg.getEndRes());
+      SequenceGroup sg = new SequenceGroup(sequences, "",
+                                           cs, true, true,
+                                           false, 0,
+                                           av.alignment.getWidth() - 1);
 
-            c.calculate();
-            c.verdict(false, av.ConsPercGaps);
-            cs.setConservation(c);
+      sg.setName("JTreeGroup:" + sg.hashCode());
 
-            sg.cs = cs;
+      if (av.getGlobalColourScheme() != null
+          && av.getGlobalColourScheme().conservationApplied())
+      {
+        Conservation c = new Conservation("Group",
+                                          ResidueProperties.propHash, 3,
+                                          sg.getSequences(null),
+                                          sg.getStartRes(),
+                                          sg.getEndRes());
 
-          }
+        c.calculate();
+        c.verdict(false, av.ConsPercGaps);
+        cs.setConservation(c);
 
-          av.alignment.addGroup(sg);
+        sg.cs = cs;
 
-        }
+      }
+
+      av.alignment.addGroup(sg);
+
+    }
 
   }