From: jprocter <Jim Procter>
Date: Fri, 4 Jun 2010 16:09:49 +0000 (+0000)
Subject: update group annotation for new treegroups (JAL-552)
X-Git-Tag: Release_2_6~202
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a28784f8c598dbb91e41df691c86b282fe7174c4;hp=2b3bd506ee1cc2d1a26a3425ccba48665179a9fb;p=jalview.git

update group annotation for new treegroups (JAL-552)
---

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 84e5efe..750e823 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1327,6 +1327,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
 
   public void updateAnnotation(boolean applyGlobalSettings)
   {
+    // TODO: this should be merged with other annotation update stuff - that sits on AlignViewport
     boolean updateCalcs = false;
     boolean conv = av.isShowGroupConservation();
     boolean cons = av.isShowGroupConsensus();
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 028552c..c2b9b7f 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -864,6 +864,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
   void colourGroups()
   {
+    AlignmentPanel[] aps = getAssociatedPanels();
     for (int i = 0; i < tree.getGroups().size(); i++)
     {
       Color col = new Color((int) (Math.random() * 255), (int) (Math
@@ -912,7 +913,6 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
       sg.setName("JTreeGroup:" + sg.hashCode());
       sg.setIdColour(col);
-      AlignmentPanel[] aps = getAssociatedPanels();
       for (int a = 0; a < aps.length; a++)
       {
         if (aps[a].av.getGlobalColourScheme() != null
@@ -930,6 +930,11 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         aps[a].av.alignment.addGroup(sg);
       }
     }
+    // notify the panel to redo any group specific stuff.
+    for (int a=0;a<aps.length;a++)
+    {
+      aps[a].updateAnnotation();
+    }
 
   }