X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=09152d69662e720be130742507c141dea6f4fdd3;hb=18254310f30a2f4d39a4110228e61f05953021cb;hp=8f25e7771f2c9e5eecd0006d1dee40b4a06c4952;hpb=e66bdc1c0086ab56c56979d9dc6635e81503eb84;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 8f25e77..09152d6 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -240,7 +240,7 @@ public class AnnotationRenderer } // TODO extend annotation row to enable dynamic and static profile data to // be stored - if (aa.groupRef == null && aa.sequenceRef == null && av_renderProfile) + if (aa.groupRef == null && aa.sequenceRef == null) { return AAFrequency.extractProfile(hconsensus[column], av_ignoreGapsConsensus); @@ -262,7 +262,7 @@ public class AnnotationRenderer // to // be stored if (aa.groupRef == null && aa.sequenceRef == null - && av_renderProfile && hStrucConsensus != null + && hStrucConsensus != null && hStrucConsensus.length > column) { return StructureFrequency.extractProfile(hStrucConsensus[column], @@ -318,7 +318,7 @@ public class AnnotationRenderer boolean centreColLabels, centreColLabelsDef = av .getCentreColumnLabels(); boolean scaleColLabel = false; - AlignmentAnnotation consensusAnnot=av.getAlignmentConsensusAnnotation(); + AlignmentAnnotation consensusAnnot=av.getAlignmentConsensusAnnotation(),structConsensusAnnot=av.getAlignmentStrucConsensusAnnotation(); boolean renderHistogram = true, renderProfile = true, normaliseProfile = false; BitSet graphGroupDrawn = new BitSet(); @@ -343,7 +343,7 @@ public class AnnotationRenderer renderProfile = row.groupRef.isShowSequenceLogo(); normaliseProfile = row.groupRef.isNormaliseSequenceLogo(); } - else if (row == consensusAnnot) + else if (row == consensusAnnot || row == structConsensusAnnot) { renderHistogram = av_renderHistogram; renderProfile = av_renderProfile;