From: Jim Procter Date: Mon, 21 Nov 2016 16:31:45 +0000 (+0000) Subject: JAL-2335 patched FeatureRendererModel.findFeaturesAtRes to honour isContactFeature X-Git-Tag: Release_2_10_1~10^2~1^2 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=refs%2Fheads%2Fbug%2FJAL-2323disulfideOverview JAL-2335 patched FeatureRendererModel.findFeaturesAtRes to honour isContactFeature --- diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java index 7ff9adf..c1ad465 100644 --- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java +++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java @@ -288,8 +288,12 @@ public abstract class FeatureRendererModel implements continue; } - if ((features[i].getBegin() <= res) - && (features[i].getEnd() >= res)) + // check if start/end are at res, and if not a contact feature, that res + // lies between start and end + if ((features[i].getBegin() == res || features[i].getEnd() == res) + || (!features[i].isContactFeature() + && (features[i].getBegin() < res) && (features[i] + .getEnd() >= res))) { tmp.add(features[i]); }