X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=a0e530cf127554e871febc4474da45a8184c3886;hb=8b1e1c7cf7bcf6499dad546699c85d8d52e6d86c;hp=3fdcb3b7f548e080a804d25cee8de8d80f6dfaf1;hpb=853624fb32058cccc544ae7d13af6ad4b0800b6c;p=jalview.git diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java index 3fdcb3b..a0e530c 100644 --- a/src/jalview/renderer/AnnotationRenderer.java +++ b/src/jalview/renderer/AnnotationRenderer.java @@ -28,6 +28,7 @@ import jalview.api.AlignViewportI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Annotation; import jalview.datamodel.ColumnSelection; +import jalview.datamodel.ProfilesI; import jalview.schemes.ColourSchemeI; import jalview.schemes.ResidueProperties; import jalview.util.Platform; @@ -73,7 +74,7 @@ public class AnnotationRenderer private ColumnSelection columnSelection; - private Hashtable[] hconsensus; + private ProfilesI hconsensus; private Hashtable[] complementConsensus; @@ -351,7 +352,7 @@ public class AnnotationRenderer { // TODO? group consensus for cDNA complement return AAFrequency.extractProfile( - aa.groupRef.consensusData[column], + aa.groupRef.consensusData.get(column), aa.groupRef.getIgnoreGapsConsensus()); } // TODO extend annotation row to enable dynamic and static profile data to @@ -365,7 +366,8 @@ public class AnnotationRenderer } else { - return AAFrequency.extractProfile(hconsensus[column], + return AAFrequency.extractProfile( +hconsensus.get(column), av_ignoreGapsConsensus); } }