X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSequenceRenderer.java;h=9badf43bd78ce3b119d3d5cb16c631989c8cb995;hb=b948e764c92b0954100f216927114b2c9720b76c;hp=92d5beb738f673df5fd1410533d75fccebc020d3;hpb=b5d61763044c1d72f06ce0e50da2171422a3774b;p=jalview.git diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java index 92d5beb..9badf43 100755 --- a/src/jalview/appletgui/SequenceRenderer.java +++ b/src/jalview/appletgui/SequenceRenderer.java @@ -230,7 +230,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer } char s = ' '; - + boolean srep = av.isDisplayReferenceSeq(); for (int i = start; i <= end; i++) { graphics.setColor(Color.black); @@ -255,9 +255,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer } if (currentSequenceGroup.getShowNonconserved()) { - // cheat - use this if we have a consensus for each group: s = - // getDisplayChar(currentSequenceGroup.getConsensus(), i, s, '.'); - s = getDisplayChar(av.getAlignmentConsensusAnnotation(), i, s, + s = getDisplayChar(srep, i, s, '.'); } } @@ -282,7 +280,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer } if (av.getShowUnconserved()) { - s = getDisplayChar(av.getAlignmentConsensusAnnotation(), i, s, + s = getDisplayChar(srep, i, s, '.'); } @@ -315,10 +313,12 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer } - private char getDisplayChar(AlignmentAnnotation consensus, int position, + private char getDisplayChar(final boolean usesrep, int position, char s, char c) { - char conschar = consensus.annotations[position].displayCharacter + // TODO - use currentSequenceGroup rather than alignemnt + // currentSequenceGroup.getConsensus() + char conschar = (usesrep) ? av.getAlignment().getSeqrep().getCharAt(position) : av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter .charAt(0); if (conschar != '-' && s == conschar) {