X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=27a8a9ccae9fdb52e32414a8ca3d3b8e4116ae2a;hb=21e2a80f7db56c011481d65d5bcb458654226e20;hp=663977421e2242eb9a04b3140bf61b9eb23fb8f2;hpb=c6e2247dff4ec4158d0d234a22390fae4baff178;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 6639774..27a8a9c 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -209,6 +209,7 @@ public class SeqCanvas extends JPanel SequenceI nextSeq; SequenceGroup group=null; + SequenceGroup [] groups=null; boolean inGroup=false; // are we in a defined group? boolean inRB=false; //Are we in a rubberband group? int sx=-1, sy=-1, ex=-1, ey=-1; @@ -219,8 +220,9 @@ public class SeqCanvas extends JPanel nextSeq = av.getAlignment().getSequenceAt(i); group = av.alignment.findGroup( nextSeq ); + groups = av.alignment.findAllGroups( nextSeq ); - sr.drawSequence(g, nextSeq, group,x1,x2, + sr.drawSequence(g, nextSeq, groups,x1,x2, (x1 - startx) * charWidth, offset + AlignmentUtil.getPixelHeight(starty, i, av.getCharHeight()), charWidth,charHeight,null, i); @@ -308,7 +310,7 @@ public class SeqCanvas extends JPanel int searchStart = searchResults[r+1]; int searchEnd = searchResults[r+2]; - if (searchSeq >= y1 && searchSeq <= y2) + if (searchSeq >= y1 && searchSeq < y2) { SequenceRenderer ssr = (SequenceRenderer) sr; ssr.drawHighlightedText(av.getAlignment().getSequenceAt(searchSeq),