X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceRenderer.java;h=64fe053e2cce4a05570c32114cf7a2c825a5a263;hb=eed52865f3bf3e1d4d8c7f08fba483ecce6d83e6;hp=aec61b52eed2ec8b56e9fcfaa07bfae6decc9b87;hpb=205bbecbedfa28a3f4b3b4909c4f8be2a96b6579;p=jalview.git diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java index aec61b5..64fe053 100755 --- a/src/jalview/gui/SequenceRenderer.java +++ b/src/jalview/gui/SequenceRenderer.java @@ -29,12 +29,6 @@ import java.awt.Color; import java.awt.FontMetrics; import java.awt.Graphics; -/** - * DOCUMENT ME! - * - * @author $author$ - * @version $Revision$ - */ public class SequenceRenderer implements jalview.api.SequenceRenderer { final static int CHAR_TO_UPPER = 'A' - 'a'; @@ -91,6 +85,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer @Override public Color getResidueBoxColour(SequenceI seq, int i) { + // rate limiting step when rendering overview for lots of groups allGroups = av.getAlignment().findAllGroups(seq); if (inCurrentSequenceGroup(i)) @@ -417,7 +412,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer } if (!isarep && av.getShowUnconserved()) { - s = getDisplayChar(srep, i, s, '.', currentSequenceGroup); + s = getDisplayChar(srep, i, s, '.', null); } @@ -455,8 +450,10 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer .getCharAt(position) : av.getAlignment().getSeqrep() .getCharAt(position))) : (currentGroup != null && currentGroup.getConsensus() != null - && position >= currentGroup.getStartRes() && position <= currentGroup - .getEndRes()) ? currentGroup.getConsensus().annotations[position].displayCharacter + && position >= currentGroup.getStartRes() + && position <= currentGroup.getEndRes() && currentGroup + .getConsensus().annotations.length > position) ? currentGroup + .getConsensus().annotations[position].displayCharacter .charAt(0) : av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter .charAt(0);