X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRenderer.java;fp=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRenderer.java;h=a1980c76e851058bbfd28db25dd74b45b7434ca4;hb=74393b51f368cb9f58589472d432a433d9c4386d;hp=d580f2ccf32bf914e27dbd1d248a3810491c20c5;hpb=7a0d503181fe41452120a8a02ca63476392aa08c;p=jalview.git diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java index d580f2c..a1980c7 100644 --- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java +++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java @@ -22,8 +22,8 @@ package jalview.renderer.seqfeatures; import jalview.api.AlignViewportI; import jalview.api.FeatureColourI; +import jalview.datamodel.ContiguousI; import jalview.datamodel.MappedFeatures; -import jalview.datamodel.Range; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; @@ -276,9 +276,9 @@ public class FeatureRenderer extends FeatureRendererModel /* * if columns are all gapped, or sequence has no features, nothing to do */ - Range visiblePositions = seq.findPositions(start+1, end+1); - if (visiblePositions == null || (!seq.getFeatures().hasFeatures() - && !av.isShowComplementFeatures())) + ContiguousI visiblePositions = seq.findPositions(start + 1, end + 1); + if (visiblePositions == null || !seq.getFeatures().hasFeatures() + && !av.isShowComplementFeatures()) { return null; } @@ -447,12 +447,16 @@ public class FeatureRenderer extends FeatureRendererModel */ Color drawComplementFeatures(final Graphics g, final SequenceI seq, int start, int end, int y1, boolean colourOnly, - Range visiblePositions, Color drawnColour) + ContiguousI visiblePositions, Color drawnColour) { AlignViewportI comp = av.getCodingComplement(); FeatureRenderer fr2 = Desktop.getAlignFrameFor(comp) .getFeatureRenderer(); - for (int pos = visiblePositions.start; pos <= visiblePositions.end; pos++) + + final int visibleStart = visiblePositions.getBegin(); + final int visibleEnd = visiblePositions.getEnd(); + + for (int pos = visibleStart; pos <= visibleEnd; pos++) { int column = seq.findIndex(pos); MappedFeatures mf = fr2