X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureColourFinder.java;h=d5784b001af2da2cd493b463c3ea9c3ff1281817;hb=abb6a42bd20af71788ee997e352f2cbb7160c940;hp=00cbd2c21b3629d755851da7fda6be24e8adde19;hpb=f6123f656fa387e11f506dedd09672a0d0ff5ac5;p=jalview.git diff --git a/src/jalview/renderer/seqfeatures/FeatureColourFinder.java b/src/jalview/renderer/seqfeatures/FeatureColourFinder.java index 00cbd2c..d5784b0 100644 --- a/src/jalview/renderer/seqfeatures/FeatureColourFinder.java +++ b/src/jalview/renderer/seqfeatures/FeatureColourFinder.java @@ -20,6 +20,7 @@ */ package jalview.renderer.seqfeatures; +import jalview.api.AlignViewportI; import jalview.api.FeatureRenderer; import jalview.api.FeaturesDisplayedI; import jalview.datamodel.SequenceI; @@ -75,7 +76,7 @@ public class FeatureColourFinder * @param defaultColour * @param seq * @param column - * alignment column position (base zero) + * alignment column position (0..) * @return */ public Color findFeatureColour(Color defaultColour, SequenceI seq, @@ -101,7 +102,7 @@ public class FeatureColourFinder } } - Color c = featureRenderer.findFeatureColour(seq, column, g); + Color c = featureRenderer.findFeatureColour(seq, column + 1, g); if (c == null) { return defaultColour; @@ -122,8 +123,16 @@ public class FeatureColourFinder */ boolean noFeaturesDisplayed() { - if (featureRenderer == null - || !featureRenderer.getViewport().isShowSequenceFeatures()) + if (featureRenderer == null) + { + return true; + } + AlignViewportI av = featureRenderer.getViewport(); + if (av.isShowComplementFeatures()) + { + return false; + } + if (!av.isShowSequenceFeatures()) { return true; }