X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=55ce44a23ed71c3babeaee2d70c39d2d777ba1cf;hb=3176c105e6751e32129840f5bfa410921a9c25e6;hp=efa23bd5c834c837895574e378a4bcf71941844a;hpb=d1cc36a40eb3acd5c3d9fa680150709b7a8523a7;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index efa23bd..55ce44a 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -1148,14 +1148,22 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (aa != null) { ContactMatrixI cm = av.getContactMatrix(aa); + // generally, we assume cm has 1:1 mapping to annotation row - probably wrong + // but.. if if (cm instanceof MappableContactMatrixI) { + int[] pos; + // use the mappable's mapping - always the case for PAE Matrices so good + // for 2.11.3 MappableContactMatrixI mcm = (MappableContactMatrixI) cm; - int pos[]=mcm.getMappedPositionsFor(rseq, colm+1); - if (pos!=null) + pos = mcm.getMappedPositionsFor(rseq, colm + 1); + // finally, look up the position of the column + if (pos != null) { - offp=rseq.findIndex(pos[0]); + offp = rseq.findIndex(pos[0]); } + } else { + offp = colm; } } if (offp<=0) @@ -1262,6 +1270,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } } } + PaintRefresher.Refresh(tp, av.getSequenceSetId()); } public void createSeqGroupFor(AlignmentPanel[] aps, Vector l,