X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2Fseqfeatures%2FFeatureRenderer.java;h=9e0089f98cbdfd2ef9d6bf221a90f1b782036a2f;hb=b9867dd3b0aeaa0fcb839b59cadbb1f76309cb5e;hp=07d97d01e5105aa70528c1cdf5c7867cb3c26f4e;hpb=adc06771b3c3eeaac8f54514f00d7c3c692b8844;p=jalview.git diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java index 07d97d0..9e0089f 100644 --- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java +++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java @@ -330,8 +330,9 @@ public class FeatureRenderer extends FeatureRendererModel } sfSize = lastSequenceFeatures.length; - for (String type : renderOrder) + for (int renderIndex = 0; renderIndex < renderOrder.length; renderIndex++) { + String type = renderOrder[renderIndex]; if (!showFeatureOfType(type)) { continue; @@ -365,7 +366,8 @@ public class FeatureRenderer extends FeatureRendererModel } Color featureColour = getColour(sequenceFeature); - boolean isDisulfideBond = "disulfide bond".equals(sequenceFeature.type); + boolean isContactFeature = sequenceFeature.isContactFeature(); + if (offscreenRender && offscreenImage == null) { /* @@ -375,7 +377,7 @@ public class FeatureRenderer extends FeatureRendererModel */ boolean featureIsAtPosition = sequenceFeature.begin <= start && sequenceFeature.end >= start; - if (isDisulfideBond) + if (isContactFeature) { featureIsAtPosition = sequenceFeature.begin == start || sequenceFeature.end == start; @@ -392,7 +394,7 @@ public class FeatureRenderer extends FeatureRendererModel } } - else if (isDisulfideBond) + else if (isContactFeature) { renderFeature(g, seq, seq.findIndex(sequenceFeature.begin) - 1, seq.findIndex(sequenceFeature.begin) - 1, featureColour,