X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=c1a6b0a0de73091334c476bbb7a40994800550af;hb=b600601cfc5f7d03b8793a1d32ffa78c0fbab8cd;hp=bb028bf79a5f790ea2bb22c33663fe0af8135ab8;hpb=279c6495df1a0de231600a2d283098c7411c4730;p=jalview.git

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index bb028bf..c1a6b0a 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -143,9 +143,43 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     scrollPane = scroller;
     addMouseListener(this);
     addMouseMotionListener(this);
+    
     ToolTipManager.sharedInstance().registerComponent(this);
   }
 
+  public void clearSelectedLeaves()
+  {
+    Vector<BinaryNode> leaves = tp.getTree()
+            .findLeaves(tp.getTree().getTopNode());
+    if (tp.isColumnWise())
+    {
+      markColumnsFor(getAssociatedPanels(), leaves, Color.white, true);
+    }
+    else
+    {
+      for (AlignmentPanel ap : getAssociatedPanels())
+      {
+        SequenceGroup selected = ap.av.getSelectionGroup();
+        if (selected != null)
+        {
+          {
+            for (int i = 0; i < leaves.size(); i++)
+            {
+              SequenceI seq = (SequenceI) leaves.elementAt(i).element();
+              if (selected.contains(seq))
+              {
+                selected.addOrRemove(seq, false);
+              }
+            }
+            selected.recalcConservation();
+          }
+        }
+        ap.av.sendSelection();
+      }
+    }
+    PaintRefresher.Refresh(tp, av.getSequenceSetId());
+    repaint();
+  }
   /**
    * DOCUMENT ME!
    * 
@@ -830,7 +864,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       Vector<BinaryNode> leaves = tree.findLeaves(highlightNode);
       if (tp.isColumnWise())
       {
-        markColumnsFor(getAssociatedPanels(), leaves, Color.red);
+        markColumnsFor(getAssociatedPanels(), leaves, Color.red,false);
       }
       else
       {
@@ -1109,12 +1143,33 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     }
     ColumnSelection cs = av.getColumnSelection();
     HiddenColumns hc = av.getAlignment().getHiddenColumns();
-    int offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm)
+    AlignmentAnnotation aa = tp.getAssocAnnotation();
+    int offp=-1;
+    if (aa != null)
+    {
+      ContactMatrixI cm = av.getContactMatrix(aa);
+      if (cm instanceof MappableContactMatrixI)
+      {
+        MappableContactMatrixI mcm = (MappableContactMatrixI) cm;
+        int pos[]=mcm.getMappedPositionsFor(rseq, colm);
+        if (pos!=null)
+        {
+          offp=rseq.findIndex(pos[0])-1;
+        } else {
+          offp=-2;
+        }
+      }
+    }
+    if (offp==-1)
+    {
+      // assume a direct mapping to reference or column number
+        offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm)
             : colm;
+    }
 
     if (!av.hasHiddenColumns())
     {
-      return cs.contains(offp - 1);
+      return cs.contains(offp);
     }
     if (hc.isVisible(offp - 1))
     {
@@ -1151,7 +1206,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
   }
 
   private void markColumnsFor(AlignmentPanel[] aps, Vector<BinaryNode> l,
-          Color col)
+          Color col, boolean clearSelected)
   {
     SequenceI rseq = tp.assocAnnotation.sequenceRef;
     if (av == null || av.getAlignment() == null)
@@ -1191,22 +1246,22 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
           continue;
         }
         // TODO: handle ranges...
-        offp = seqpos[0];
+        offp = seqpos[0]-1;
       }
       else
       {
         offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm)
                 : colm;
       }
-      if (!av.hasHiddenColumns() || hc.isVisible(offp - 1))
+      if (!av.hasHiddenColumns() || hc.isVisible(offp))
       {
-        if (cs.contains(offp - 1))
+        if (clearSelected || cs.contains(offp))
         {
-          cs.removeElement(offp - 1);
+          cs.removeElement(offp);
         }
         else
         {
-          cs.addElement(offp - 1);
+          cs.addElement(offp);
         }
       }
     }