git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b600601
)
JAL-4134 highlight selected column nodes on the linked alignment view using getMapped...
author
James Procter
<j.procter@dundee.ac.uk>
Tue, 30 May 2023 16:12:19 +0000
(17:12 +0100)
committer
James Procter
<j.procter@dundee.ac.uk>
Tue, 30 May 2023 16:12:19 +0000
(17:12 +0100)
src/jalview/gui/TreeCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
c1a6b0a
..
efa23bd
100755
(executable)
--- 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;
if (cm instanceof MappableContactMatrixI)
{
MappableContactMatrixI mcm = (MappableContactMatrixI) cm;
- int pos[]=mcm.getMappedPositionsFor(rseq, colm);
+ int pos[]=mcm.getMappedPositionsFor(rseq, colm+1);
if (pos!=null)
{
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 (!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;
// return cs.contains(hc.absoluteToVisibleColumn(offp));
}
return false;