From d1cc36a40eb3acd5c3d9fa680150709b7a8523a7 Mon Sep 17 00:00:00 2001 From: James Procter Date: Tue, 30 May 2023 17:12:19 +0100 Subject: [PATCH] JAL-4134 highlight selected column nodes on the linked alignment view using getMappedPositionsFor --- src/jalview/gui/TreeCanvas.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index c1a6b0a..efa23bd 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -1151,29 +1151,26 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (cm instanceof MappableContactMatrixI) { MappableContactMatrixI mcm = (MappableContactMatrixI) cm; - int pos[]=mcm.getMappedPositionsFor(rseq, colm); + int pos[]=mcm.getMappedPositionsFor(rseq, colm+1); if (pos!=null) { - offp=rseq.findIndex(pos[0])-1; - } else { - offp=-2; + offp=rseq.findIndex(pos[0]); } } } - if (offp==-1) + if (offp<=0) { - // assume a direct mapping to reference or column number - offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm) - : colm; + return false; } + offp-=2; if (!av.hasHiddenColumns()) { return cs.contains(offp); } - if (hc.isVisible(offp - 1)) + if (hc.isVisible(offp)) { - return cs.contains(offp - 1); + return cs.contains(offp); // return cs.contains(hc.absoluteToVisibleColumn(offp)); } return false; -- 1.7.10.2