git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2624 check feature colour threshold when colouring structure
[jalview.git]
/
src
/
jalview
/
renderer
/
seqfeatures
/
FeatureRenderer.java
diff --git
a/src/jalview/renderer/seqfeatures/FeatureRenderer.java
b/src/jalview/renderer/seqfeatures/FeatureRenderer.java
index
98f5bff
..
759101d
100644
(file)
--- a/
src/jalview/renderer/seqfeatures/FeatureRenderer.java
+++ b/
src/jalview/renderer/seqfeatures/FeatureRenderer.java
@@
-335,6
+335,12
@@
public class FeatureRenderer extends FeatureRendererModel
}
Color featureColour = getColour(sequenceFeature);
}
Color featureColour = getColour(sequenceFeature);
+ if (featureColour == null)
+ {
+ // score feature outwith threshold for colouring
+ continue;
+ }
+
boolean isContactFeature = sequenceFeature.isContactFeature();
if (isContactFeature)
boolean isContactFeature = sequenceFeature.isContactFeature();
if (isContactFeature)
@@
-352,7
+358,7
@@
public class FeatureRenderer extends FeatureRendererModel
drawnColour = featureColour;
}
}
drawnColour = featureColour;
}
}
- else if (showFeature(sequenceFeature))
+ else
{
if (av.isShowSequenceFeaturesHeight()
&& !Float.isNaN(sequenceFeature.score))
{
if (av.isShowSequenceFeaturesHeight()
&& !Float.isNaN(sequenceFeature.score))