continue;
}
+ /*
+ * find features of this type, and the colour of the _last_ one
+ * (the one that would be drawn on top) that has a colour
+ */
List<SequenceFeature> overlaps = seq.findFeatures(column, column,
type);
- for (SequenceFeature sequenceFeature : overlaps)
+ for (int i = overlaps.size() - 1 ; i >= 0 ; i--)
{
+ SequenceFeature sequenceFeature = overlaps.get(i);
if (!featureGroupNotShown(sequenceFeature))
{
Color col = getColour(sequenceFeature);
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
+import java.awt.Color;
+import java.util.List;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.viewmodel.seqfeatures.FeatureRendererModel;
import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
-import java.awt.Color;
-import java.util.List;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
/**
* Unit tests for feature colour determination, including but not limited to
* <ul>
assertNull(c);
}
+ /**
+ * Nested features coloured by label - expect the colour of the enclosed
+ * feature
+ */
+ @Test(groups = "Functional")
+ public void testFindFeatureColour_nestedFeatures()
+ {
+ SequenceFeature sf1 = new SequenceFeature("domain", "peptide", 1, 120, 0f, null);
+ seq.addSequenceFeature(sf1);
+ SequenceFeature sf2 = new SequenceFeature("domain", "binding", 10, 20,
+ 0f, null);
+ seq.addSequenceFeature(sf2);
+ FeatureColourI fc = new FeatureColour(Color.red);
+ fc.setColourByLabel(true);
+ fr.setColour("domain", fc);
+ fr.featuresAdded();
+ av.setShowSequenceFeatures(true);
+ Color c = finder.findFeatureColour(null, seq, 15);
+ assertEquals(c, fr.getColor(sf2, fc));
+ }
+
@Test(groups = "Functional")
public void testFindFeatureColour_multipleFeaturesAtPositionNoTransparency()
{