import jalview.datamodel.SequenceFeature;
import jalview.util.ColorUtils;
import jalview.util.Format;
+import jalview.util.matcher.KeyedMatcherI;
import java.awt.Color;
import java.util.StringTokenizer;
+import java.util.function.Function;
/**
* A class that wraps either a simple colour or a graduated colour
final private float deltaBlue;
+ /*
+ * optional filter by attribute values
+ */
+ private KeyedMatcherI attributeFilters;
+
/**
* Parses a Jalview features file format colour descriptor
* [label|][mincolour|maxcolour
Color colour = ColorUtils.parseColourString(descriptor);
if (colour == null)
{
- throw new IllegalArgumentException("Invalid colour descriptor: "
- + descriptor);
+ throw new IllegalArgumentException(
+ "Invalid colour descriptor: " + descriptor);
}
return new FeatureColour(colour);
}
{
if (!ttype.toLowerCase().startsWith("no"))
{
- System.err.println("Ignoring unrecognised threshold type : "
- + ttype);
+ System.err.println(
+ "Ignoring unrecognised threshold type : " + ttype);
}
}
}
}
if (gcol.hasMoreTokens())
{
- System.err
- .println("Ignoring additional tokens in parameters in graduated colour specification\n");
+ System.err.println(
+ "Ignoring additional tokens in parameters in graduated colour specification\n");
while (gcol.hasMoreTokens())
{
System.err.println("|" + gcol.nextToken());
base = fc.base;
range = fc.range;
isHighToLow = fc.isHighToLow;
+ attributeFilters = fc.attributeFilters;
setAboveThreshold(fc.isAboveThreshold());
setBelowThreshold(fc.isBelowThreshold());
setThreshold(fc.getThreshold());
@Override
public Color getColor(SequenceFeature feature)
{
+ if (!matchesFilters(feature))
+ {
+ return null;
+ }
+
if (isColourByLabel())
{
- return ColorUtils
- .createColourFromName(feature.getDescription());
+ return ColorUtils.createColourFromName(feature.getDescription());
}
if (!isGraduatedColour())
/*
* graduated colour case, optionally with threshold
- * (treating Float.NaN as within visible range here)
+ * Float.NaN is assigned minimum visible score colour
*/
float scr = feature.getScore();
+ if (Float.isNaN(scr))
+ {
+ return getMinColour();
+ }
if (isAboveThreshold() && scr <= threshold)
{
return null;
{
return getMaxColour();
}
- if (Float.isNaN(scr))
- {
- return getMinColour();
- }
float scl = (scr - base) / range;
if (isHighToLow)
{
}
/**
+ * Answers true if there are any attribute value filters defined, and the
+ * feature matches all of the filter conditions
+ *
+ * @param feature
+ *
+ * @return
+ */
+ boolean matchesFilters(SequenceFeature feature)
+ {
+ Function<String, String> valueProvider = key -> feature.otherDetails == null ? null
+ : (feature.otherDetails.containsKey(key) ? feature.otherDetails
+ .get(key).toString() : null);
+ return attributeFilters == null ? true : attributeFilters
+ .matches(valueProvider);
+ }
+
+ /**
* Returns the maximum score of the graduated colour range
*
* @return
return String.format("%s\t%s", featureType, colourString);
}
+ /**
+ * Adds an attribute filter
+ *
+ * @param attName
+ * @param filter
+ */
+ @Override
+ public void setAttributeFilters(KeyedMatcherI matcher)
+ {
+ attributeFilters = matcher;
+ }
+
+ @Override
+ public KeyedMatcherI getAttributeFilters()
+ {
+ return attributeFilters;
+ }
}