From e8de20ca6781f6152fdd3cef89122a5a654e3496 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Fri, 9 Jun 2017 15:21:35 +0100 Subject: [PATCH] JAL-2589 render colour scheme gap colour in overview --- src/jalview/renderer/seqfeatures/FeatureRenderer.java | 6 +++++- test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/jalview/renderer/seqfeatures/FeatureRenderer.java b/src/jalview/renderer/seqfeatures/FeatureRenderer.java index 72ac2c8..98f5bff 100644 --- a/src/jalview/renderer/seqfeatures/FeatureRenderer.java +++ b/src/jalview/renderer/seqfeatures/FeatureRenderer.java @@ -223,7 +223,11 @@ public class FeatureRenderer extends FeatureRendererModel if (Comparison.isGap(seq.getCharAt(column))) { - return Color.white; + /* + * returning null allows the colour scheme to provide gap colour + * - normally white, but can be customised otherwise + */ + return null; } Color renderedColour = null; diff --git a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java index 59566ed..9b68b43 100644 --- a/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java +++ b/test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java @@ -2,6 +2,7 @@ package jalview.renderer.seqfeatures; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import jalview.api.FeatureColourI; @@ -126,6 +127,10 @@ public class FeatureColourFinderTest assertEquals(c, Color.red); } + /** + * feature colour at a gap is null (not white) - a user defined colour scheme + * can then provide a bespoke gap colour if configured to do so + */ @Test(groups = "Functional") public void testFindFeatureColour_gapPosition() { @@ -135,7 +140,7 @@ public class FeatureColourFinderTest fr.featuresAdded(); av.setShowSequenceFeatures(true); Color c = finder.findFeatureColour(null, seq, 6); - assertEquals(c, Color.white); + assertNull(c); } @Test(groups = "Functional") -- 1.7.10.2