* give "Type3" features a graduated colour scheme
* - first with no threshold
*/
- FeatureColourI gc = new FeatureColour(Color.yellow, Color.red, null, 0f,
- 10f);
+ FeatureColourI gc = new FeatureColour(Color.green, Color.yellow,
+ Color.red, null, 0f, 10f);
fr.getFeatureColours().put("Type3", gc);
features = fr.findFeaturesAtColumn(seq, 8);
assertTrue(features.contains(sf4));
SequenceI seq = av.getAlignment().getSequenceAt(0);
SequenceFeature sf1 = new SequenceFeature("Cath", "", 6, 8, Float.NaN,
"group1");
- seq.addSequenceFeature(sf1);
SequenceFeature sf2 = new SequenceFeature("Cath", "", 5, 11, 2f,
"group2");
- seq.addSequenceFeature(sf2);
SequenceFeature sf3 = new SequenceFeature("Cath", "", 5, 11, 3f,
"group3");
- seq.addSequenceFeature(sf3);
SequenceFeature sf4 = new SequenceFeature("Cath", "", 6, 8, 4f,
"group4");
- seq.addSequenceFeature(sf4);
SequenceFeature sf5 = new SequenceFeature("Cath", "", 6, 9, 5f,
"group4");
+ seq.addSequenceFeature(sf1);
+ seq.addSequenceFeature(sf2);
+ seq.addSequenceFeature(sf3);
+ seq.addSequenceFeature(sf4);
seq.addSequenceFeature(sf5);
fr.findAllFeatures(true);
assertTrue(features.contains(sf5));
/*
- * hide groups 2 and 3 makes no difference to this method
+ * features in hidden groups are removed
*/
fr.setGroupVisibility("group2", false);
fr.setGroupVisibility("group3", false);
features = seq.getSequenceFeatures();
fr.filterFeaturesForDisplay(features);
- assertEquals(features.size(), 3);
+ assertEquals(features.size(), 2);
assertTrue(features.contains(sf1) || features.contains(sf4));
assertFalse(features.contains(sf1) && features.contains(sf4));
- assertTrue(features.contains(sf2) || features.contains(sf3));
- assertFalse(features.contains(sf2) && features.contains(sf3));
+ assertFalse(features.contains(sf2));
+ assertFalse(features.contains(sf3));
assertTrue(features.contains(sf5));
/*
* graduated colour by score, no threshold, no score
*
*/
- FeatureColourI gc = new FeatureColour(Color.yellow, Color.red,
- Color.green, 1f, 11f);
+ FeatureColourI gc = new FeatureColour(Color.red, Color.yellow,
+ Color.red, Color.green, 1f, 11f);
fr.getFeatureColours().put("Cath", gc);
assertEquals(fr.getColour(sf1), Color.green);
* threshold is min-max; now score 6 is 1/6 of the way from 5 to 11
* or from yellow(255, 255, 0) to red(255, 0, 0)
*/
- gc = new FeatureColour(Color.yellow, Color.red, Color.green, 5f, 11f);
+ gc = new FeatureColour(Color.red, Color.yellow, Color.red, Color.green,
+ 5f, 11f);
fr.getFeatureColours().put("Cath", gc);
gc.setAutoScaled(false); // this does little other than save a checkbox setting!
assertEquals(fr.getColour(sf2), new Color(255, 213, 0));
* colour by feature attribute value
* first with no value held
*/
- gc = new FeatureColour(Color.yellow, Color.red, Color.green, 1f, 11f);
+ gc = new FeatureColour(Color.red, Color.yellow, Color.red, Color.green,
+ 1f, 11f);
fr.getFeatureColours().put("Cath", gc);
gc.setAttributeName("AF");
assertEquals(fr.getColour(sf2), Color.green);
/*
* feature score outwith colour threshold (score > 2)
*/
- FeatureColourI fc = new FeatureColour(Color.white, Color.black,
+ FeatureColourI fc = new FeatureColour(null, Color.white, Color.black,
Color.white, 0, 10);
fc.setAboveThreshold(true);
fc.setThreshold(2f);