package jalview.appletgui;
import jalview.datamodel.SequenceI;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
import jalview.viewmodel.OverviewDimensions;
import java.awt.Color;
int sameCol = 0;
SequenceI seq = null;
+ FeatureColourFinder finder = new FeatureColourFinder(fr);
final boolean hasHiddenCols = av.hasHiddenColumns();
boolean hiddenRow = false;
lastcol = (int) (col * sampleCol);
color = getColumnColourFromSequence(seq, hiddenRow,
- hasHiddenCols, lastcol);
+ hasHiddenCols, lastcol, finder);
mg.setColor(color);
if (sameCol == 1 && sameRow == 1)
*/
private Color getColumnColourFromSequence(
jalview.datamodel.SequenceI seq, boolean hiddenRow,
- boolean hasHiddenCols, int lastcol)
+ boolean hasHiddenCols, int lastcol, FeatureColourFinder finder)
{
- Color color;
+ Color color = Color.white;
if (seq.getLength() > lastcol)
{
- color = sr.getResidueBoxColour(seq, lastcol);
-
- if (av.isShowSequenceFeatures())
- {
- color = fr.findFeatureColour(color, seq, lastcol);
- }
- }
- else
- {
- color = Color.white;
+ color = sr.getResidueColour(seq, lastcol, finder);
}
if (hiddenRow