X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Frenderer%2FOverviewResColourFinder.java;h=a98f3b30a23a8898f6d09f11ae66eb7b193b2d59;hb=3e88c926f9e1fc649f9c0932b57eb088052473ec;hp=94e7c5b18934a8b281e07db9fb8b9220ee6056d2;hpb=cc9c7f4a740c5f4097ab02aec9afb43ebfa28e83;p=jalview.git diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java index 94e7c5b..a98f3b3 100644 --- a/src/jalview/renderer/OverviewResColourFinder.java +++ b/src/jalview/renderer/OverviewResColourFinder.java @@ -78,6 +78,15 @@ public class OverviewResColourFinder extends ResidueColourFinder HIDDEN_COLOUR = hiddenCol; } + @Override + /** + * for Test suite only. + */ + public Color getBoxColour(ResidueShaderI shader, SequenceI seq, int i) + { + return new Color(getBoxColourInt(shader, seq, i)); + } + public int getBoxColourInt(ResidueShaderI shader, SequenceI seq, int i) { char currentChar = seq.getCharAt(i); @@ -93,6 +102,19 @@ public class OverviewResColourFinder extends ResidueColourFinder : shader.findColourInt(currentChar, i, seq)); } + /** + * For test suite only. + */ + @Override + public Color getResidueColour(boolean showBoxes, ResidueShaderI shader, + SequenceGroup[] allGroups, final SequenceI seq, int i, + FeatureColourFinder finder) + { + return new Color(getResidueColourInt(showBoxes, shader, allGroups, seq, + i, finder)); + } + + public int getResidueColourInt(boolean showBoxes, ResidueShaderI shader, SequenceGroup[] allGroups, final SequenceI seq, int i, FeatureColourFinder finder) @@ -104,17 +126,27 @@ public class OverviewResColourFinder extends ResidueColourFinder return c; } - int col = getResidueBoxColourInt(showBoxes, shader, allGroups, seq, - i); - + int col = getResidueBoxColourInt(showBoxes, shader, allGroups, seq, i); // if there's a FeatureColourFinder we might override the residue colour // here with feature colouring return seq.setColor(i, finder == null || finder.noFeaturesDisplayed() ? col - : finder.findFeatureColourInt(col, seq, i)); + : finder.findFeatureColourInt(col, seq, i)); } - + + /** + * For test suite only. + */ + @Override + protected Color getResidueBoxColour(boolean showBoxes, + ResidueShaderI shader, SequenceGroup[] allGroups, SequenceI seq, + int i) + { + return new Color( + getResidueBoxColourInt(showBoxes, shader, allGroups, seq, i)); + } + /** * In the overview, the showBoxes setting is ignored, as the overview displays * the colours regardless.