package jalview.appletgui;
import jalview.datamodel.AlignmentI;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
import java.awt.Color;
import java.awt.Dimension;
{
miniMe = null;
int alwidth = av.getAlignment().getWidth();
- int alheight = av.getAlignment().getHeight();
+ int alheight = av.getAlignment().getHeight()
+ + av.getAlignment().getHiddenSequences().getSize();
if (av.isShowSequenceFeatures())
{
Color color = Color.yellow;
int row, col, sameRow = 0, sameCol = 0;
jalview.datamodel.SequenceI seq;
+ final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av
+ .hasHiddenColumns();
boolean hiddenRow = false;
AlignmentI alignment = av.getAlignment();
+
+ FeatureColourFinder finder = new FeatureColourFinder(fr);
for (row = 0; row <= sequencesHeight; row++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
if ((int) (row * sampleRow) == lastrow)
{
sameRow++;
}
hiddenRow = false;
- if (av.hasHiddenRows())
+ if (hasHiddenRows)
{
seq = alignment.getHiddenSequences().getHiddenSequence(lastrow);
if (seq == null)
if (seq.getLength() > lastcol)
{
- color = sr.getResidueBoxColour(seq, lastcol);
-
- if (av.isShowSequenceFeatures())
- {
- color = fr.findFeatureColour(color, seq, lastcol);
- }
+ color = sr.getResidueColour(seq, lastcol, finder);
}
else
{
- color = Color.white; // White
+ color = Color.white;
}
if (hiddenRow
- || (av.hasHiddenColumns() && !av.getColumnSelection()
- .isVisible(lastcol)))
+ || (hasHiddenCols && !av.getColumnSelection().isVisible(
+ lastcol)))
{
color = color.darker().darker();
}
{
for (col = 0; col < width; col++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
lastcol = (int) (col * sampleCol);
{
mg.translate(col, sequencesHeight);